test-rename-dir-merge.out
44 lines
| 1.2 KiB
| text/plain
|
TextLexer
/ tests / test-rename-dir-merge.out
|
r3735 | adding a/a | ||
adding a/b | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
copying a/a to b/a | ||||
copying a/b to b/b | ||||
removing a/a | ||||
removing a/b | ||||
2 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
resolving manifests | ||||
overwrite None partial False | ||||
ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 55119e611c80 | ||||
a/c: remote renamed directory to b/c -> d | ||||
|
r4416 | a/b: other deleted -> r | ||
a/a: other deleted -> r | ||||
b/a: remote created -> g | ||||
b/b: remote created -> g | ||||
|
r3735 | removing a/a | ||
removing a/b | ||||
moving a/c to b/c | ||||
|
r4416 | getting b/a | ||
getting b/b | ||||
3 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
|
r3735 | (branch merge, don't forget to commit) | ||
|
r3748 | a/* b/a b/b b/c | ||
|
r3735 | M b/a | ||
M b/b | ||||
A b/c | ||||
a/c | ||||
R a/a | ||||
R a/b | ||||
R a/c | ||||
|
r5229 | b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 | ||
|
r4416 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
|
r3735 | resolving manifests | ||
overwrite None partial False | ||||
ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb | ||||
None: local renamed directory to b/c -> d | ||||
getting a/c to b/c | ||||
|
r4416 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r3735 | (branch merge, don't forget to commit) | ||
|
r3748 | a/* b/a b/b b/c | ||
|
r3735 | A b/c | ||
a/c | ||||
|
r5229 | b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 | ||