132 b |
132 b |
133 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
133 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
134 src: 'a' -> dst: 'b' * |
134 src: 'a' -> dst: 'b' * |
135 checking for directory renames |
135 checking for directory renames |
136 resolving manifests |
136 resolving manifests |
137 overwrite: False, partial: False |
137 branchmerge: True, force: True, partial: False |
138 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 |
138 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 |
139 b: local copied/moved to a -> m |
139 b: local copied/moved to a -> m |
140 preserving b for resolve of b |
140 preserving b for resolve of b |
141 updating: b 1/1 files (100.00%) |
141 updating: b 1/1 files (100.00%) |
142 picked tool 'internal:merge' for b (binary False symlink False) |
142 picked tool 'internal:merge' for b (binary False symlink False) |
145 premerge successful |
145 premerge successful |
146 b |
146 b |
147 grafting revision 5 |
147 grafting revision 5 |
148 searching for copies back to rev 1 |
148 searching for copies back to rev 1 |
149 resolving manifests |
149 resolving manifests |
150 overwrite: False, partial: False |
150 branchmerge: True, force: True, partial: False |
151 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 |
151 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 |
152 e: remote is newer -> g |
152 e: remote is newer -> g |
153 updating: e 1/1 files (100.00%) |
153 updating: e 1/1 files (100.00%) |
154 getting e |
154 getting e |
155 e |
155 e |
156 grafting revision 4 |
156 grafting revision 4 |
157 searching for copies back to rev 1 |
157 searching for copies back to rev 1 |
158 resolving manifests |
158 resolving manifests |
159 overwrite: False, partial: False |
159 branchmerge: True, force: True, partial: False |
160 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
160 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
161 d: remote is newer -> g |
161 d: remote is newer -> g |
162 e: versions differ -> m |
162 e: versions differ -> m |
163 preserving e for resolve of e |
163 preserving e for resolve of e |
164 updating: d 1/2 files (50.00%) |
164 updating: d 1/2 files (50.00%) |