429 | () [default] draft |
429 | () [default] draft |
430 o 9:2228e3b74514 add newfile |
430 o 9:2228e3b74514 add newfile |
431 | () [default] draft |
431 | () [default] draft |
432 o 0:8fa14d15e168 added hgignore |
432 o 0:8fa14d15e168 added hgignore |
433 () [default] draft |
433 () [default] draft |
|
434 |
|
435 when relocating "other" hit merge conflict but not "divergent" |
|
436 -------------------------------------------------------------- |
|
437 $ hg strip 14: --hidden |
|
438 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
439 saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/74fbf3e6a0b6-15474722-backup.hg |
|
440 8 new content-divergent changesets |
|
441 |
|
442 Insert conflicting changes in between the stack of content-div csets |
|
443 $ hg up -r "max(desc('added b'))" |
|
444 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
445 $ echo b_diverging_local > b |
|
446 $ hg amend |
|
447 2 new orphan changesets |
|
448 $ hg evolve |
|
449 move:[12] added c |
|
450 atop:[14] added b |
|
451 move:[13] added d |
|
452 $ hg up -r d5f148423c16 |
|
453 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
454 $ echo b_diverging_other > b |
|
455 $ hg amend |
|
456 2 new orphan changesets |
|
457 $ hg evolve |
|
458 move:[7] added c |
|
459 atop:[17] added b |
|
460 move:[8] added d |
|
461 |
|
462 Now let's try to evolve stack |
|
463 $ hg evolve --content-divergent |
|
464 merge:[10] added a |
|
465 with: [5] watbar to a |
|
466 base: [1] added a |
|
467 rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514 |
|
468 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
469 merge:[14] added b |
|
470 with: [17] added b |
|
471 base: [2] added b |
|
472 rebasing "divergent" content-divergent changeset 2a955e808c53 on 74fbf3e6a0b6 |
|
473 rebasing "other" content-divergent changeset 509103439e5e on 74fbf3e6a0b6 |
|
474 merging b |
|
475 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
|
476 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
477 4 new orphan changesets |
|
478 unresolved merge conflicts |
|
479 (see 'hg help evolve.interrupted') |
|
480 [1] |
|
481 |
|
482 $ echo foo > b |
|
483 $ hg res -m |
|
484 (no more unresolved files) |
|
485 continue: hg evolve --continue |
|
486 $ hg evolve --continue |
|
487 merge:[15] added c |
|
488 with: [18] added c |
|
489 base: [3] added c |
|
490 rebasing "divergent" content-divergent changeset 48b0f803817a on 4e29776e83a5 |
|
491 rebasing "other" content-divergent changeset eaf34afe4df3 on 4e29776e83a5 |
|
492 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
493 merge:[16] added d |
|
494 with: [19] added d |
|
495 base: [4] added d |
|
496 rebasing "divergent" content-divergent changeset 91c8ccb9c241 on 77126af93a25 |
|
497 rebasing "other" content-divergent changeset c351be27f199 on 77126af93a25 |
|
498 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
499 working directory is now at 4e29776e83a5 |
|
500 |
|
501 $ hg evolve -l |
434 |
502 |
435 $ cd .. |
503 $ cd .. |
436 |
504 |
437 Make sure that content-divergent resolution doesn't undo a change (issue6203) |
505 Make sure that content-divergent resolution doesn't undo a change (issue6203) |
438 ----------------------------------------------------------------------------- |
506 ----------------------------------------------------------------------------- |