286 o 1:c7586e2a9264 added a |
286 o 1:c7586e2a9264 added a |
287 | () [default] draft |
287 | () [default] draft |
288 o 0:8fa14d15e168 added hgignore |
288 o 0:8fa14d15e168 added hgignore |
289 () [default] draft |
289 () [default] draft |
290 |
290 |
291 $ hg evolve --content-divergent |
291 $ hg evolve --content-divergent --no-all |
292 merge:[9] added a d with bar in it, expect some beers |
292 merge:[9] added a d with bar in it, expect some beers |
293 with: [8] added d |
293 with: [8] added d |
294 base: [7] added d |
294 base: [7] added d |
295 merging "other" content-divergent changeset 'f621d00f5f0e' |
295 merging "other" content-divergent changeset 'f621d00f5f0e' |
296 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
296 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
335 o 1:c7586e2a9264 added a |
335 o 1:c7586e2a9264 added a |
336 | () [default] draft |
336 | () [default] draft |
337 o 0:8fa14d15e168 added hgignore |
337 o 0:8fa14d15e168 added hgignore |
338 () [default] draft |
338 () [default] draft |
339 |
339 |
340 $ hg evolve --content-divergent |
340 $ hg evolve --content-divergent --no-all |
341 merge:[12] foo to d |
341 merge:[12] foo to d |
342 with: [11] foo to d |
342 with: [11] foo to d |
343 base: [10] added a d with bar in it, expect some beers |
343 base: [10] added a d with bar in it, expect some beers |
344 merging "other" content-divergent changeset 'b10b07a394f1' |
344 merging "other" content-divergent changeset 'b10b07a394f1' |
345 merging d |
345 merging d |
395 o 1:c7586e2a9264 added a |
395 o 1:c7586e2a9264 added a |
396 | () [default] draft |
396 | () [default] draft |
397 o 0:8fa14d15e168 added hgignore |
397 o 0:8fa14d15e168 added hgignore |
398 () [default] draft |
398 () [default] draft |
399 |
399 |
400 $ hg evolve --content-divergent |
400 $ hg evolve --content-divergent --no-all |
401 merge:[15] wat to d, wat? |
401 merge:[15] wat to d, wat? |
402 with: [14] bar to d, expect beers |
402 with: [14] bar to d, expect beers |
403 base: [13] foo to d |
403 base: [13] foo to d |
404 merging "other" content-divergent changeset '27f0463f169a' |
404 merging "other" content-divergent changeset '27f0463f169a' |
405 merging d |
405 merging d |
503 o 0:6569b5a81c7e@default(public) bk:[] root |
503 o 0:6569b5a81c7e@default(public) bk:[] root |
504 |
504 |
505 |
505 |
506 Stabilize it |
506 Stabilize it |
507 |
507 |
508 $ hg evolve -qn --confirm --content-divergent |
508 $ hg evolve -qn --confirm --content-divergent --no-all |
509 merge:[3] More addition |
509 merge:[3] More addition |
510 with: [2] More addition |
510 with: [2] More addition |
511 base: [1] More addition |
511 base: [1] More addition |
512 perform evolve? [Ny] n |
512 perform evolve? [Ny] n |
513 abort: evolve aborted by user |
513 abort: evolve aborted by user |
514 [255] |
514 [255] |
515 $ echo y | hg evolve -qn --confirm --config ui.interactive=True --content-divergent |
515 $ echo y | hg evolve -qn --confirm --config ui.interactive=True --content-divergent --no-all |
516 merge:[3] More addition |
516 merge:[3] More addition |
517 with: [2] More addition |
517 with: [2] More addition |
518 base: [1] More addition |
518 base: [1] More addition |
519 perform evolve? [Ny] y |
519 perform evolve? [Ny] y |
520 hg update -c 051337a45e7c && |
520 hg update -c 051337a45e7c && |
521 hg merge fc6349f931da && |
521 hg merge fc6349f931da && |
522 hg commit -m "auto merge resolving conflict between 051337a45e7c and fc6349f931da"&& |
522 hg commit -m "auto merge resolving conflict between 051337a45e7c and fc6349f931da"&& |
523 hg up -C 867e43582046 && |
523 hg up -C 867e43582046 && |
524 hg revert --all --rev tip && |
524 hg revert --all --rev tip && |
525 hg commit -m "`hg log -r 051337a45e7c --template={desc}`"; |
525 hg commit -m "`hg log -r 051337a45e7c --template={desc}`"; |
526 $ hg evolve -v --content-divergent |
526 $ hg evolve -v --content-divergent --no-all |
527 merge:[3] More addition |
527 merge:[3] More addition |
528 with: [2] More addition |
528 with: [2] More addition |
529 base: [1] More addition |
529 base: [1] More addition |
530 merging "other" content-divergent changeset 'fc6349f931da' |
530 merging "other" content-divergent changeset 'fc6349f931da' |
531 resolving manifests |
531 resolving manifests |
599 | * 4:5bf84d1d71d1@default(draft) bk:[] More addition |
599 | * 4:5bf84d1d71d1@default(draft) bk:[] More addition |
600 |/ |
600 |/ |
601 o 0:6569b5a81c7e@default(public) bk:[] root |
601 o 0:6569b5a81c7e@default(public) bk:[] root |
602 |
602 |
603 |
603 |
604 $ hg evolve -qn --content-divergent |
604 $ hg evolve -qn --content-divergent --no-all |
605 hg update -c 13c1b75640a1 && |
605 hg update -c 13c1b75640a1 && |
606 hg merge 5bf84d1d71d1 && |
606 hg merge 5bf84d1d71d1 && |
607 hg commit -m "auto merge resolving conflict between 13c1b75640a1 and 5bf84d1d71d1"&& |
607 hg commit -m "auto merge resolving conflict between 13c1b75640a1 and 5bf84d1d71d1"&& |
608 hg up -C 867e43582046 && |
608 hg up -C 867e43582046 && |
609 hg revert --all --rev tip && |
609 hg revert --all --rev tip && |
610 hg commit -m "`hg log -r 13c1b75640a1 --template={desc}`"; |
610 hg commit -m "`hg log -r 13c1b75640a1 --template={desc}`"; |
611 $ hg evolve --content-divergent |
611 $ hg evolve --content-divergent --no-all |
612 merge:[6] More addition (2) |
612 merge:[6] More addition (2) |
613 with: [4] More addition |
613 with: [4] More addition |
614 base: [1] More addition |
614 base: [1] More addition |
615 merging "other" content-divergent changeset '5bf84d1d71d1' |
615 merging "other" content-divergent changeset '5bf84d1d71d1' |
616 merging a |
616 merging a |