242 o 0:07f494440405@default(public) bk:[] adda |
242 o 0:07f494440405@default(public) bk:[] adda |
243 |
243 |
244 |
244 |
245 Stabilize it |
245 Stabilize it |
246 |
246 |
247 $ hg evolve -qn --confirm --contentdivergent |
247 $ hg evolve -qn --confirm --content-divergent |
248 merge:[14] More addition |
248 merge:[14] More addition |
249 with: [13] More addition |
249 with: [13] More addition |
250 base: [12] More addition |
250 base: [12] More addition |
251 perform evolve? [Ny] n |
251 perform evolve? [Ny] n |
252 abort: evolve aborted by user |
252 abort: evolve aborted by user |
253 [255] |
253 [255] |
254 $ echo y | hg evolve -qn --confirm --config ui.interactive=True --contentdivergent |
254 $ echo y | hg evolve -qn --confirm --config ui.interactive=True --content-divergent |
255 merge:[14] More addition |
255 merge:[14] More addition |
256 with: [13] More addition |
256 with: [13] More addition |
257 base: [12] More addition |
257 base: [12] More addition |
258 perform evolve? [Ny] y |
258 perform evolve? [Ny] y |
259 hg update -c eacc9c8240fe && |
259 hg update -c eacc9c8240fe && |
260 hg merge d2f173e25686 && |
260 hg merge d2f173e25686 && |
261 hg commit -m "auto merge resolving conflict between eacc9c8240fe and d2f173e25686"&& |
261 hg commit -m "auto merge resolving conflict between eacc9c8240fe and d2f173e25686"&& |
262 hg up -C 3932c176bbaa && |
262 hg up -C 3932c176bbaa && |
263 hg revert --all --rev tip && |
263 hg revert --all --rev tip && |
264 hg commit -m "`hg log -r eacc9c8240fe --template={desc}`"; |
264 hg commit -m "`hg log -r eacc9c8240fe --template={desc}`"; |
265 $ hg evolve -v --contentdivergent |
265 $ hg evolve -v --content-divergent |
266 merge:[14] More addition |
266 merge:[14] More addition |
267 with: [13] More addition |
267 with: [13] More addition |
268 base: [12] More addition |
268 base: [12] More addition |
269 merging divergent changeset |
269 merging divergent changeset |
270 resolving manifests |
270 resolving manifests |
334 # reamend so that the case is not the first precursor. |
334 # reamend so that the case is not the first precursor. |
335 $ hg amend -m "More addition (2)" |
335 $ hg amend -m "More addition (2)" |
336 $ hg phase 'contentdivergent()' |
336 $ hg phase 'contentdivergent()' |
337 15: draft |
337 15: draft |
338 17: draft |
338 17: draft |
339 $ hg evolve -qn --contentdivergent |
339 $ hg evolve -qn --content-divergent |
340 hg update -c 0b336205a5d0 && |
340 hg update -c 0b336205a5d0 && |
341 hg merge f344982e63c4 && |
341 hg merge f344982e63c4 && |
342 hg commit -m "auto merge resolving conflict between 0b336205a5d0 and f344982e63c4"&& |
342 hg commit -m "auto merge resolving conflict between 0b336205a5d0 and f344982e63c4"&& |
343 hg up -C 3932c176bbaa && |
343 hg up -C 3932c176bbaa && |
344 hg revert --all --rev tip && |
344 hg revert --all --rev tip && |
345 hg commit -m "`hg log -r 0b336205a5d0 --template={desc}`"; |
345 hg commit -m "`hg log -r 0b336205a5d0 --template={desc}`"; |
346 $ hg evolve --contentdivergent |
346 $ hg evolve --content-divergent |
347 merge:[17] More addition (2) |
347 merge:[17] More addition (2) |
348 with: [15] More addition |
348 with: [15] More addition |
349 base: [12] More addition |
349 base: [12] More addition |
350 merging a |
350 merging a |
351 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
351 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |