73 |
73 |
74 |
74 |
75 $ hg merge -v --debug --tool internal:dump 5 --config merge.preferancestor='!' |
75 $ hg merge -v --debug --tool internal:dump 5 --config merge.preferancestor='!' |
76 note: using 0f6b37dbe527 as ancestor of 3b08d01b0ab5 and adfe50279922 |
76 note: using 0f6b37dbe527 as ancestor of 3b08d01b0ab5 and adfe50279922 |
77 alternatively, use --config merge.preferancestor=40663881a6dd |
77 alternatively, use --config merge.preferancestor=40663881a6dd |
78 searching for copies back to rev 3 |
|
79 resolving manifests |
78 resolving manifests |
80 branchmerge: True, force: False, partial: False |
79 branchmerge: True, force: False, partial: False |
81 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 |
80 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 |
82 preserving f2 for resolve of f2 |
81 preserving f2 for resolve of f2 |
83 f1: remote is newer -> g |
82 f1: remote is newer -> g |
135 $ hg up -qC . |
134 $ hg up -qC . |
136 $ hg merge -v --debug --tool internal:dump 5 --config merge.preferancestor="*" |
135 $ hg merge -v --debug --tool internal:dump 5 --config merge.preferancestor="*" |
137 note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd |
136 note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd |
138 |
137 |
139 calculating bids for ancestor 0f6b37dbe527 |
138 calculating bids for ancestor 0f6b37dbe527 |
140 searching for copies back to rev 3 |
|
141 resolving manifests |
139 resolving manifests |
142 branchmerge: True, force: False, partial: False |
140 branchmerge: True, force: False, partial: False |
143 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 |
141 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 |
144 f1: remote is newer -> g |
142 f1: remote is newer -> g |
145 f2: versions differ -> m |
143 f2: versions differ -> m |
146 |
144 |
147 calculating bids for ancestor 40663881a6dd |
145 calculating bids for ancestor 40663881a6dd |
148 searching for copies back to rev 3 |
|
149 resolving manifests |
146 resolving manifests |
150 branchmerge: True, force: False, partial: False |
147 branchmerge: True, force: False, partial: False |
151 ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 |
148 ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 |
152 f1: versions differ -> m |
149 f1: versions differ -> m |
153 f2: remote unchanged -> k |
150 f2: remote unchanged -> k |
180 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
177 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
181 $ hg merge -v --debug --config merge.preferancestor="*" |
178 $ hg merge -v --debug --config merge.preferancestor="*" |
182 note: merging adfe50279922+ and 3b08d01b0ab5 using bids from ancestors 0f6b37dbe527 and 40663881a6dd |
179 note: merging adfe50279922+ and 3b08d01b0ab5 using bids from ancestors 0f6b37dbe527 and 40663881a6dd |
183 |
180 |
184 calculating bids for ancestor 0f6b37dbe527 |
181 calculating bids for ancestor 0f6b37dbe527 |
185 searching for copies back to rev 3 |
|
186 resolving manifests |
182 resolving manifests |
187 branchmerge: True, force: False, partial: False |
183 branchmerge: True, force: False, partial: False |
188 ancestor: 0f6b37dbe527, local: adfe50279922+, remote: 3b08d01b0ab5 |
184 ancestor: 0f6b37dbe527, local: adfe50279922+, remote: 3b08d01b0ab5 |
189 f1: remote unchanged -> k |
185 f1: remote unchanged -> k |
190 f2: versions differ -> m |
186 f2: versions differ -> m |
191 |
187 |
192 calculating bids for ancestor 40663881a6dd |
188 calculating bids for ancestor 40663881a6dd |
193 searching for copies back to rev 3 |
|
194 resolving manifests |
189 resolving manifests |
195 branchmerge: True, force: False, partial: False |
190 branchmerge: True, force: False, partial: False |
196 ancestor: 40663881a6dd, local: adfe50279922+, remote: 3b08d01b0ab5 |
191 ancestor: 40663881a6dd, local: adfe50279922+, remote: 3b08d01b0ab5 |
197 f1: versions differ -> m |
192 f1: versions differ -> m |
198 f2: remote is newer -> g |
193 f2: remote is newer -> g |
247 $ hg up -qC |
242 $ hg up -qC |
248 $ hg merge -v --debug --config merge.preferancestor="*" |
243 $ hg merge -v --debug --config merge.preferancestor="*" |
249 note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd |
244 note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd |
250 |
245 |
251 calculating bids for ancestor 0f6b37dbe527 |
246 calculating bids for ancestor 0f6b37dbe527 |
252 searching for copies back to rev 3 |
|
253 resolving manifests |
247 resolving manifests |
254 branchmerge: True, force: False, partial: False |
248 branchmerge: True, force: False, partial: False |
255 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 |
249 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 |
256 f1: remote is newer -> g |
250 f1: remote is newer -> g |
257 f2: versions differ -> m |
251 f2: versions differ -> m |
258 |
252 |
259 calculating bids for ancestor 40663881a6dd |
253 calculating bids for ancestor 40663881a6dd |
260 searching for copies back to rev 3 |
|
261 resolving manifests |
254 resolving manifests |
262 branchmerge: True, force: False, partial: False |
255 branchmerge: True, force: False, partial: False |
263 ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 |
256 ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 |
264 f1: versions differ -> m |
257 f1: versions differ -> m |
265 f2: remote unchanged -> k |
258 f2: remote unchanged -> k |
415 |
408 |
416 $ hg merge 3 --debug |
409 $ hg merge 3 --debug |
417 note: merging c0ef19750a22+ and 6ca01f7342b9 using bids from ancestors 11b5b303e36c and 154e6000f54e |
410 note: merging c0ef19750a22+ and 6ca01f7342b9 using bids from ancestors 11b5b303e36c and 154e6000f54e |
418 |
411 |
419 calculating bids for ancestor 11b5b303e36c |
412 calculating bids for ancestor 11b5b303e36c |
420 searching for copies back to rev 3 |
|
421 unmatched files in local: |
413 unmatched files in local: |
422 d1/a |
414 d1/a |
423 d1/b |
415 d1/b |
424 unmatched files in other: |
416 unmatched files in other: |
425 d2/b |
417 d2/b |
427 branchmerge: True, force: False, partial: False |
419 branchmerge: True, force: False, partial: False |
428 ancestor: 11b5b303e36c, local: c0ef19750a22+, remote: 6ca01f7342b9 |
420 ancestor: 11b5b303e36c, local: c0ef19750a22+, remote: 6ca01f7342b9 |
429 d2/b: remote created -> g |
421 d2/b: remote created -> g |
430 |
422 |
431 calculating bids for ancestor 154e6000f54e |
423 calculating bids for ancestor 154e6000f54e |
432 searching for copies back to rev 3 |
|
433 unmatched files in other: |
424 unmatched files in other: |
434 d2/b |
425 d2/b |
435 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
426 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
436 src: 'd1/b' -> dst: 'd2/b' |
427 src: 'd1/b' -> dst: 'd2/b' |
437 checking for directory renames |
428 checking for directory renames |