equal
deleted
inserted
replaced
197 hg commit --msg "phase-divergent update to 98bb3a6cfe1a" |
197 hg commit --msg "phase-divergent update to 98bb3a6cfe1a" |
198 |
198 |
199 XXX: evolve should have mentioned that draft commit is just obsoleted in favour |
199 XXX: evolve should have mentioned that draft commit is just obsoleted in favour |
200 of public one. From the message it looks like a new commit is created. |
200 of public one. From the message it looks like a new commit is created. |
201 |
201 |
202 $ hg evolve --phase-divergent |
202 $ hg evolve --phase-divergent --update |
203 recreate:[2] tweak a |
203 recreate:[2] tweak a |
204 atop:[1] modify a |
204 atop:[1] modify a |
205 no changes to commit |
205 no changes to commit |
206 working directory is now at 4d1169d82e47 |
206 working directory is now at 4d1169d82e47 |
207 |
207 |
313 option should be there |
313 option should be there |
314 |
314 |
315 XXX: we should document what should user expect where running this, writing this |
315 XXX: we should document what should user expect where running this, writing this |
316 test I have to go through code base to understand what will be the behavior |
316 test I have to go through code base to understand what will be the behavior |
317 |
317 |
318 $ hg evolve --phase-divergent |
318 $ hg evolve --phase-divergent --update |
319 recreate:[4] added bar to foo |
319 recreate:[4] added bar to foo |
320 atop:[3] added foo to foo |
320 atop:[3] added foo to foo |
321 committed as 3d62500c673d |
321 committed as 3d62500c673d |
322 working directory is now at 3d62500c673d |
322 working directory is now at 3d62500c673d |
323 |
323 |
466 () public |
466 () public |
467 |
467 |
468 Resolving the new phase-divergence changeset using `hg evolve` |
468 Resolving the new phase-divergence changeset using `hg evolve` |
469 --------------------------------------------------------------- |
469 --------------------------------------------------------------- |
470 |
470 |
471 $ hg evolve --phase-divergent |
471 $ hg evolve --phase-divergent --update |
472 recreate:[7] foo to bar |
472 recreate:[7] foo to bar |
473 atop:[6] added bar to bar |
473 atop:[6] added bar to bar |
474 committed as 502e73736632 |
474 committed as 502e73736632 |
475 working directory is now at 502e73736632 |
475 working directory is now at 502e73736632 |
476 |
476 |
602 ~ |
602 ~ |
603 |
603 |
604 Using `hg evolve` to resolve phase-divergence |
604 Using `hg evolve` to resolve phase-divergence |
605 --------------------------------------------- |
605 --------------------------------------------- |
606 |
606 |
607 $ hg evolve --phase-divergent |
607 $ hg evolve --phase-divergent --update |
608 recreate:[10] added x to x |
608 recreate:[10] added x to x |
609 atop:[9] added x to x |
609 atop:[9] added x to x |
610 rebasing to destination parent: 502e73736632 |
610 rebasing to destination parent: 502e73736632 |
611 (leaving bookmark bm) |
611 (leaving bookmark bm) |
612 no changes to commit |
612 no changes to commit |
723 rewritten(parent) as 211ab84d1689 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
723 rewritten(parent) as 211ab84d1689 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
724 |
724 |
725 Resolving divergence using `hg evolve` |
725 Resolving divergence using `hg evolve` |
726 ------------------------------------- |
726 ------------------------------------- |
727 |
727 |
728 $ hg evolve --phase-divergent |
728 $ hg evolve --phase-divergent --update |
729 recreate:[14] y to y and foobar to foo |
729 recreate:[14] y to y and foobar to foo |
730 atop:[12] y to y and foobar to foo |
730 atop:[12] y to y and foobar to foo |
731 rebasing to destination parent: 2352021b3785 |
731 rebasing to destination parent: 2352021b3785 |
732 committed as 8c2bb6fb44e9 |
732 committed as 8c2bb6fb44e9 |
733 working directory is now at 8c2bb6fb44e9 |
733 working directory is now at 8c2bb6fb44e9 |
799 1 new phase-divergent changesets |
799 1 new phase-divergent changesets |
800 |
800 |
801 Resolution using `hg evolve --phase-divergent` |
801 Resolution using `hg evolve --phase-divergent` |
802 ---------------------------------------------- |
802 ---------------------------------------------- |
803 |
803 |
804 $ hg evolve --phase-divergent |
804 $ hg evolve --phase-divergent --update |
805 recreate:[19] added l to l |
805 recreate:[19] added l to l |
806 atop:[17] added l to l |
806 atop:[17] added l to l |
807 rebasing to destination parent: 8c2bb6fb44e9 |
807 rebasing to destination parent: 8c2bb6fb44e9 |
808 merging x |
808 merging x |
809 warning: conflicts while merging x! (edit, then use 'hg resolve --mark') |
809 warning: conflicts while merging x! (edit, then use 'hg resolve --mark') |