equal
deleted
inserted
replaced
29 a/c |
29 a/c |
30 unmatched files in other: |
30 unmatched files in other: |
31 b/a |
31 b/a |
32 b/b |
32 b/b |
33 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
33 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
34 b/a -> a/a |
34 src: 'a/a' -> dst: 'b/a' |
35 b/b -> a/b |
35 src: 'a/b' -> dst: 'b/b' |
36 checking for directory renames |
36 checking for directory renames |
37 dir a/ -> b/ |
37 discovered dir src: 'a/' -> dst: 'b/' |
38 file a/c -> b/c |
38 pending file src: 'a/c' -> dst: 'b/c' |
39 resolving manifests |
39 resolving manifests |
40 overwrite: False, partial: False |
40 overwrite: False, partial: False |
41 ancestor: f9b20c0d4c51, local: ce36d17b18fb+, remote: 397f8b00a740 |
41 ancestor: f9b20c0d4c51, local: ce36d17b18fb+, remote: 397f8b00a740 |
42 a/c: remote renamed directory to b/c -> d |
42 a/c: remote renamed directory to b/c -> d |
43 a/b: other deleted -> r |
43 a/b: other deleted -> r |
80 b/a |
80 b/a |
81 b/b |
81 b/b |
82 unmatched files in other: |
82 unmatched files in other: |
83 a/c |
83 a/c |
84 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
84 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
85 b/a -> a/a |
85 src: 'a/a' -> dst: 'b/a' |
86 b/b -> a/b |
86 src: 'a/b' -> dst: 'b/b' |
87 checking for directory renames |
87 checking for directory renames |
88 dir a/ -> b/ |
88 discovered dir src: 'a/' -> dst: 'b/' |
89 file a/c -> b/c |
89 pending file src: 'a/c' -> dst: 'b/c' |
90 resolving manifests |
90 resolving manifests |
91 overwrite: False, partial: False |
91 overwrite: False, partial: False |
92 ancestor: f9b20c0d4c51, local: 397f8b00a740+, remote: ce36d17b18fb |
92 ancestor: f9b20c0d4c51, local: 397f8b00a740+, remote: ce36d17b18fb |
93 None: local renamed directory to b/c -> d |
93 None: local renamed directory to b/c -> d |
94 updating:None 1/1 files (100.00%) |
94 updating:None 1/1 files (100.00%) |