equal
deleted
inserted
replaced
126 Redo merge with merge.preferancestor="*" to enable bid merge |
126 Redo merge with merge.preferancestor="*" to enable bid merge |
127 |
127 |
128 $ rm f* |
128 $ rm f* |
129 $ hg up -qC . |
129 $ hg up -qC . |
130 $ hg merge -v --debug --tool internal:dump 5 --config merge.preferancestor="*" |
130 $ hg merge -v --debug --tool internal:dump 5 --config merge.preferancestor="*" |
|
131 note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd |
131 |
132 |
132 calculating bids for ancestor 0f6b37dbe527 |
133 calculating bids for ancestor 0f6b37dbe527 |
133 searching for copies back to rev 3 |
134 searching for copies back to rev 3 |
134 resolving manifests |
135 resolving manifests |
135 branchmerge: True, force: False, partial: False |
136 branchmerge: True, force: False, partial: False |
170 $ hg up -C -r5 |
171 $ hg up -C -r5 |
171 note: using 0f6b37dbe527 as ancestor of 3b08d01b0ab5 and adfe50279922 |
172 note: using 0f6b37dbe527 as ancestor of 3b08d01b0ab5 and adfe50279922 |
172 alternatively, use --config merge.preferancestor=40663881a6dd |
173 alternatively, use --config merge.preferancestor=40663881a6dd |
173 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
174 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
174 $ hg merge -v --debug --config merge.preferancestor="*" |
175 $ hg merge -v --debug --config merge.preferancestor="*" |
|
176 note: merging adfe50279922+ and 3b08d01b0ab5 using bids from ancestors 0f6b37dbe527 and 40663881a6dd |
175 |
177 |
176 calculating bids for ancestor 0f6b37dbe527 |
178 calculating bids for ancestor 0f6b37dbe527 |
177 searching for copies back to rev 3 |
179 searching for copies back to rev 3 |
178 resolving manifests |
180 resolving manifests |
179 branchmerge: True, force: False, partial: False |
181 branchmerge: True, force: False, partial: False |
210 |
212 |
211 Verify how the output looks and and how verbose it is: |
213 Verify how the output looks and and how verbose it is: |
212 |
214 |
213 $ hg up -qC |
215 $ hg up -qC |
214 $ hg merge --config merge.preferancestor="*" |
216 $ hg merge --config merge.preferancestor="*" |
|
217 note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd |
215 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
218 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
216 (branch merge, don't forget to commit) |
219 (branch merge, don't forget to commit) |
217 |
220 |
218 $ hg up -qC |
221 $ hg up -qC |
219 $ hg merge -v --config merge.preferancestor="*" |
222 $ hg merge -v --config merge.preferancestor="*" |
|
223 note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd |
220 |
224 |
221 calculating bids for ancestor 0f6b37dbe527 |
225 calculating bids for ancestor 0f6b37dbe527 |
222 resolving manifests |
226 resolving manifests |
223 |
227 |
224 calculating bids for ancestor 40663881a6dd |
228 calculating bids for ancestor 40663881a6dd |
233 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
237 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
234 (branch merge, don't forget to commit) |
238 (branch merge, don't forget to commit) |
235 |
239 |
236 $ hg up -qC |
240 $ hg up -qC |
237 $ hg merge -v --debug --config merge.preferancestor="*" |
241 $ hg merge -v --debug --config merge.preferancestor="*" |
|
242 note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd |
238 |
243 |
239 calculating bids for ancestor 0f6b37dbe527 |
244 calculating bids for ancestor 0f6b37dbe527 |
240 searching for copies back to rev 3 |
245 searching for copies back to rev 3 |
241 resolving manifests |
246 resolving manifests |
242 branchmerge: True, force: False, partial: False |
247 branchmerge: True, force: False, partial: False |
314 b |
319 b |
315 |
320 |
316 $ hg up -qC . |
321 $ hg up -qC . |
317 |
322 |
318 $ hg merge -v --config merge.preferancestor="*" |
323 $ hg merge -v --config merge.preferancestor="*" |
|
324 note: merging 0d355fdef312+ and 4b8b546a3eef using bids from ancestors 70008a2163f6 and b211bbc6eb3c |
319 |
325 |
320 calculating bids for ancestor 70008a2163f6 |
326 calculating bids for ancestor 70008a2163f6 |
321 resolving manifests |
327 resolving manifests |
322 |
328 |
323 calculating bids for ancestor b211bbc6eb3c |
329 calculating bids for ancestor b211bbc6eb3c |