541 But at the same time, locally, this same "bathroom changeset" was updated. |
541 But at the same time, locally, this same "bathroom changeset" was updated. |
542 |
542 |
543 $ cd ../local |
543 $ cd ../local |
544 $ hg up 8a79ae8b029e -q |
544 $ hg up 8a79ae8b029e -q |
545 $ sed -i'' -e 's/... More bathroom stuff to come/Bath Robe/' shopping |
545 $ sed -i'' -e 's/... More bathroom stuff to come/Bath Robe/' shopping |
546 $ hg amend |
546 $ hg commit --amend |
547 $ hg log -G |
547 $ hg log -G |
548 @ ffa278c50818 (draft): bathroom stuff |
548 @ 30aa78f63aa1 (draft): bathroom stuff |
549 | |
549 | |
550 o a2fccc2e7b08 (public): SPAM SPAM |
550 o a2fccc2e7b08 (public): SPAM SPAM |
551 | |
551 | |
552 o 387187ad9bd9 (public): adding fruit |
552 o 387187ad9bd9 (public): adding fruit |
553 | |
553 | |
577 see both version showing up in the log. |
577 see both version showing up in the log. |
578 |
578 |
579 $ hg log -G |
579 $ hg log -G |
580 o 9ac5d0e790a2 (draft): animals |
580 o 9ac5d0e790a2 (draft): animals |
581 | |
581 | |
582 | @ ffa278c50818 (draft): bathroom stuff |
582 | @ 30aa78f63aa1 (draft): bathroom stuff |
583 | | |
583 | | |
584 x | 8a79ae8b029e (draft): bathroom stuff |
584 x | 8a79ae8b029e (draft): bathroom stuff |
585 |/ |
585 |/ |
586 o a2fccc2e7b08 (public): SPAM SPAM |
586 o a2fccc2e7b08 (public): SPAM SPAM |
587 | |
587 | |
595 |
595 |
596 |
596 |
597 The older version 8a79ae8b029e never ceased to exist in the local repo. It was |
597 The older version 8a79ae8b029e never ceased to exist in the local repo. It was |
598 jsut hidden and excluded from pull and push. |
598 jsut hidden and excluded from pull and push. |
599 |
599 |
600 .. note:: In hgview there is a nice doted relation highlighting ffa278c50818 as a new version of 8a79ae8b029e. this is not yet ported to graphlog. |
600 .. note:: In hgview there is a nice doted relation highlighting 30aa78f63aa1 as a new version of 8a79ae8b029e. this is not yet ported to graphlog. |
601 |
601 |
602 Their is **unstable** changeset in this history now. Mercurial will refuse to |
602 Their is **unstable** changeset in this history now. Mercurial will refuse to |
603 share it with the outside: |
603 share it with the outside: |
604 |
604 |
605 $ hg push other |
605 $ hg push other |
611 |
611 |
612 |
612 |
613 |
613 |
614 |
614 |
615 To resolve this unstable state, you need to rebase 9ac5d0e790a2 onto |
615 To resolve this unstable state, you need to rebase 9ac5d0e790a2 onto |
616 ffa278c50818 the "hg evolve" command will make this for you. |
616 30aa78f63aa1 the "hg evolve" command will make this for you. |
617 |
617 |
618 It has a --dry-run option to only suggest the next move. |
618 It has a --dry-run option to only suggest the next move. |
619 |
619 |
620 $ hg evolve --dry-run |
620 $ hg evolve --dry-run |
621 move:[15] animals |
621 move:[15] animals |
622 atop:[14] bathroom stuff |
622 atop:[14] bathroom stuff |
623 hg rebase -r 9ac5d0e790a2 -d ffa278c50818 |
623 hg rebase -r 9ac5d0e790a2 -d 30aa78f63aa1 |
624 |
624 |
625 Let's do it |
625 Let's do it |
626 |
626 |
627 $ hg rebase -r 9ac5d0e790a2 -d ffa278c50818 |
627 $ hg rebase -r 9ac5d0e790a2 -d 30aa78f63aa1 |
628 merging shopping |
628 merging shopping |
629 |
629 |
630 The old version of bathroom is hidden again. |
630 The old version of bathroom is hidden again. |
631 |
631 |
632 $ hg log -G |
632 $ hg log -G |
633 @ 437efbcaf700 (draft): animals |
633 @ 01fddc75bfef (draft): animals |
634 | |
634 | |
635 o ffa278c50818 (draft): bathroom stuff |
635 o 30aa78f63aa1 (draft): bathroom stuff |
636 | |
636 | |
637 o a2fccc2e7b08 (public): SPAM SPAM |
637 o a2fccc2e7b08 (public): SPAM SPAM |
638 | |
638 | |
639 o 387187ad9bd9 (public): adding fruit |
639 o 387187ad9bd9 (public): adding fruit |
640 | |
640 | |
663 pulling from $TESTTMP/local |
663 pulling from $TESTTMP/local |
664 searching for changes |
664 searching for changes |
665 no changes found |
665 no changes found |
666 Working directory parent is obsolete |
666 Working directory parent is obsolete |
667 |
667 |
668 $ hg up 437efbcaf700 |
668 $ hg up 01fddc75bfef |
669 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
669 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
670 |
670 |
671 Relocating unstable change after prune |
671 Relocating unstable change after prune |
672 ---------------------------------------------- |
672 ---------------------------------------------- |
673 |
673 |
686 adding manifests |
686 adding manifests |
687 adding file changes |
687 adding file changes |
688 added 1 changesets with 1 changes to 1 files |
688 added 1 changesets with 1 changes to 1 files |
689 (run 'hg update' to get a working copy) |
689 (run 'hg update' to get a working copy) |
690 $ hg log -G |
690 $ hg log -G |
691 o ae45c0c3092a (draft): SPAM SPAM SPAM |
691 o cf306eb0d98f (draft): SPAM SPAM SPAM |
692 | |
692 | |
693 @ 437efbcaf700 (draft): animals |
693 @ 01fddc75bfef (draft): animals |
694 | |
694 | |
695 o ffa278c50818 (draft): bathroom stuff |
695 o 30aa78f63aa1 (draft): bathroom stuff |
696 | |
696 | |
697 o a2fccc2e7b08 (public): SPAM SPAM |
697 o a2fccc2e7b08 (public): SPAM SPAM |
698 | |
698 | |
699 o 387187ad9bd9 (public): adding fruit |
699 o 387187ad9bd9 (public): adding fruit |
700 | |
700 | |
705 o 7e82d3f3c2cb (public): Monthy Python Shopping list |
705 o 7e82d3f3c2cb (public): Monthy Python Shopping list |
706 |
706 |
707 |
707 |
708 In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset: |
708 In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset: |
709 |
709 |
710 $ hg prune 437efbcaf700 |
710 $ hg prune 01fddc75bfef |
711 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
711 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
712 working directory now at ffa278c50818 |
712 working directory now at 30aa78f63aa1 |
713 1 new unstable changesets |
713 1 new unstable changesets |
714 |
714 |
715 |
715 |
716 The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset |
716 The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset |
717 is neither dead or obsolete. My repository is in an unstable state again. |
717 is neither dead or obsolete. My repository is in an unstable state again. |
718 |
718 |
719 $ hg log -G |
719 $ hg log -G |
720 o ae45c0c3092a (draft): SPAM SPAM SPAM |
720 o cf306eb0d98f (draft): SPAM SPAM SPAM |
721 | |
721 | |
722 x 437efbcaf700 (draft): animals |
722 x 01fddc75bfef (draft): animals |
723 | |
723 | |
724 @ ffa278c50818 (draft): bathroom stuff |
724 @ 30aa78f63aa1 (draft): bathroom stuff |
725 | |
725 | |
726 o a2fccc2e7b08 (public): SPAM SPAM |
726 o a2fccc2e7b08 (public): SPAM SPAM |
727 | |
727 | |
728 o 387187ad9bd9 (public): adding fruit |
728 o 387187ad9bd9 (public): adding fruit |
729 | |
729 | |
733 | |
733 | |
734 o 7e82d3f3c2cb (public): Monthy Python Shopping list |
734 o 7e82d3f3c2cb (public): Monthy Python Shopping list |
735 |
735 |
736 |
736 |
737 $ hg log -r 'unstable()' |
737 $ hg log -r 'unstable()' |
738 ae45c0c3092a (draft): SPAM SPAM SPAM |
738 cf306eb0d98f (draft): SPAM SPAM SPAM |
739 |
739 |
740 $ hg evolve |
740 $ hg evolve |
741 move:[17] SPAM SPAM SPAM |
741 move:[17] SPAM SPAM SPAM |
742 atop:[14] bathroom stuff |
742 atop:[14] bathroom stuff |
743 merging shopping |
743 merging shopping |
744 |
744 |
745 $ hg log -G |
745 $ hg log -G |
746 @ d6717f710962 (draft): SPAM SPAM SPAM |
746 @ 7e0a7cf763e4 (draft): SPAM SPAM SPAM |
747 | |
747 | |
748 o ffa278c50818 (draft): bathroom stuff |
748 o 30aa78f63aa1 (draft): bathroom stuff |
749 | |
749 | |
750 o a2fccc2e7b08 (public): SPAM SPAM |
750 o a2fccc2e7b08 (public): SPAM SPAM |
751 | |
751 | |
752 o 387187ad9bd9 (public): adding fruit |
752 o 387187ad9bd9 (public): adding fruit |
753 | |
753 | |