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 a/b: other deleted -> r |
43 a/b: other deleted -> r |
44 a/c: remote renamed directory to b/c -> d |
|
45 b/a: remote created -> g |
44 b/a: remote created -> g |
46 b/b: remote created -> g |
45 b/b: remote created -> g |
|
46 b/c: remote directory rename - move from a/c -> dm |
47 removing a/a |
47 removing a/a |
48 removing a/b |
48 removing a/b |
49 updating: a/b 2/5 files (40.00%) |
49 updating: a/b 2/5 files (40.00%) |
50 getting b/a |
50 getting b/a |
51 getting b/b |
51 getting b/b |
52 updating: b/b 4/5 files (80.00%) |
52 updating: b/b 4/5 files (80.00%) |
53 updating: a/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 |
58 $ echo a/* b/* |
58 $ echo a/* b/* |
86 discovered dir src: 'a/' -> dst: 'b/' |
86 discovered dir src: 'a/' -> dst: 'b/' |
87 pending file src: 'a/c' -> dst: 'b/c' |
87 pending file src: 'a/c' -> dst: 'b/c' |
88 resolving manifests |
88 resolving manifests |
89 branchmerge: True, force: False, partial: False |
89 branchmerge: True, force: False, partial: False |
90 ancestor: f9b20c0d4c51, local: 397f8b00a740+, remote: ce36d17b18fb |
90 ancestor: f9b20c0d4c51, local: 397f8b00a740+, remote: ce36d17b18fb |
91 None: local renamed directory to b/c -> d |
91 b/c: local directory rename - get from a/c -> dg |
92 updating:None 1/1 files (100.00%) |
92 updating: b/c 1/1 files (100.00%) |
93 getting a/c to b/c |
93 getting a/c to b/c |
94 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
94 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
95 (branch merge, don't forget to commit) |
95 (branch merge, don't forget to commit) |
96 |
96 |
97 $ echo a/* b/* |
97 $ echo a/* b/* |