38 pending file src: 'a/c' -> dst: 'b/c' |
38 pending file src: 'a/c' -> dst: 'b/c' |
39 resolving manifests |
39 resolving manifests |
40 branchmerge: True, force: False, partial: False |
40 branchmerge: True, force: False, partial: False |
41 ancestor: f9b20c0d4c51, local: ce36d17b18fb+, remote: 397f8b00a740 |
41 ancestor: f9b20c0d4c51, local: ce36d17b18fb+, remote: 397f8b00a740 |
42 a/a: other deleted -> r |
42 a/a: other deleted -> r |
|
43 removing a/a |
43 a/b: other deleted -> r |
44 a/b: other deleted -> r |
44 b/a: remote created -> g |
|
45 b/b: remote created -> g |
|
46 b/c: remote directory rename - move from a/c -> dm |
|
47 removing a/a |
|
48 removing a/b |
45 removing a/b |
49 updating: a/b 2/5 files (40.00%) |
46 updating: a/b 2/5 files (40.00%) |
|
47 b/a: remote created -> g |
50 getting b/a |
48 getting b/a |
|
49 b/b: remote created -> g |
51 getting b/b |
50 getting b/b |
52 updating: b/b 4/5 files (80.00%) |
51 updating: b/b 4/5 files (80.00%) |
|
52 b/c: remote directory rename - move from a/c -> dm |
53 updating: b/c 5/5 files (100.00%) |
53 updating: b/c 5/5 files (100.00%) |
54 moving a/c to b/c (glob) |
54 moving a/c to b/c (glob) |
55 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
55 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
56 (branch merge, don't forget to commit) |
56 (branch merge, don't forget to commit) |
57 |
57 |