equal
deleted
inserted
replaced
608 |
608 |
609 $ hg push other |
609 $ hg push other |
610 pushing to $TESTTMP/other |
610 pushing to $TESTTMP/other |
611 searching for changes |
611 searching for changes |
612 abort: push includes an unstable changeset: 9ac5d0e790a2! |
612 abort: push includes an unstable changeset: 9ac5d0e790a2! |
613 (use 'hg stabilize' to get a stable history or --force to ignore warnings) |
613 (use 'hg evolve' to get a stable history or --force to ignore warnings) |
614 [255] |
614 [255] |
615 |
615 |
616 |
616 |
617 |
617 |
618 |
618 |
619 To resolve this unstable state, you need to rebase 9ac5d0e790a2 onto |
619 To resolve this unstable state, you need to rebase 9ac5d0e790a2 onto |
620 ffa278c50818 the "hg stabilize" command will make this for you. |
620 ffa278c50818 the "hg evolve" command will make this for you. |
621 |
621 |
622 It has a --dry-run option to only suggest the next move. |
622 It has a --dry-run option to only suggest the next move. |
623 |
623 |
624 $ hg stabilize --dry-run |
624 $ hg evolve --dry-run |
625 move:[15] animals |
625 move:[15] animals |
626 atop:[14] bathroom stuff |
626 atop:[14] bathroom stuff |
627 hg rebase -Dr 9ac5d0e790a2 -d ffa278c50818 |
627 hg rebase -Dr 9ac5d0e790a2 -d ffa278c50818 |
628 |
628 |
629 Let's do it |
629 Let's do it |
739 |
739 |
740 |
740 |
741 $ hg log -r 'unstable()' |
741 $ hg log -r 'unstable()' |
742 ae45c0c3092a (draft): SPAM SPAM SPAM |
742 ae45c0c3092a (draft): SPAM SPAM SPAM |
743 |
743 |
744 $ hg stabilize --any |
744 $ hg evolve --any |
745 move:[17] SPAM SPAM SPAM |
745 move:[17] SPAM SPAM SPAM |
746 atop:[14] bathroom stuff |
746 atop:[14] bathroom stuff |
747 merging shopping |
747 merging shopping |
748 |
748 |
749 $ hg log -G |
749 $ hg log -G |