diff -r 27c890b4f864 -r fdbbc9b2fca2 tests/test-tutorial.t --- a/tests/test-tutorial.t Wed Jan 02 12:15:56 2013 +0100 +++ b/tests/test-tutorial.t Wed Jan 02 12:23:56 2013 +0100 @@ -543,9 +543,9 @@ $ cd ../local $ hg up 8a79ae8b029e -q $ sed -i'' -e 's/... More bathroom stuff to come/Bath Robe/' shopping - $ hg amend + $ hg commit --amend $ hg log -G - @ ffa278c50818 (draft): bathroom stuff + @ 30aa78f63aa1 (draft): bathroom stuff | o a2fccc2e7b08 (public): SPAM SPAM | @@ -579,7 +579,7 @@ $ hg log -G o 9ac5d0e790a2 (draft): animals | - | @ ffa278c50818 (draft): bathroom stuff + | @ 30aa78f63aa1 (draft): bathroom stuff | | x | 8a79ae8b029e (draft): bathroom stuff |/ @@ -597,7 +597,7 @@ The older version 8a79ae8b029e never ceased to exist in the local repo. It was jsut hidden and excluded from pull and push. -.. note:: In hgview there is a nice doted relation highlighting ffa278c50818 as a new version of 8a79ae8b029e. this is not yet ported to graphlog. +.. note:: In hgview there is a nice doted relation highlighting 30aa78f63aa1 as a new version of 8a79ae8b029e. this is not yet ported to graphlog. Their is **unstable** changeset in this history now. Mercurial will refuse to share it with the outside: @@ -613,26 +613,26 @@ To resolve this unstable state, you need to rebase 9ac5d0e790a2 onto -ffa278c50818 the "hg evolve" command will make this for you. +30aa78f63aa1 the "hg evolve" command will make this for you. It has a --dry-run option to only suggest the next move. $ hg evolve --dry-run move:[15] animals atop:[14] bathroom stuff - hg rebase -r 9ac5d0e790a2 -d ffa278c50818 + hg rebase -r 9ac5d0e790a2 -d 30aa78f63aa1 Let's do it - $ hg rebase -r 9ac5d0e790a2 -d ffa278c50818 + $ hg rebase -r 9ac5d0e790a2 -d 30aa78f63aa1 merging shopping The old version of bathroom is hidden again. $ hg log -G - @ 437efbcaf700 (draft): animals + @ 01fddc75bfef (draft): animals | - o ffa278c50818 (draft): bathroom stuff + o 30aa78f63aa1 (draft): bathroom stuff | o a2fccc2e7b08 (public): SPAM SPAM | @@ -665,7 +665,7 @@ no changes found Working directory parent is obsolete - $ hg up 437efbcaf700 + $ hg up 01fddc75bfef 1 files updated, 0 files merged, 0 files removed, 0 files unresolved Relocating unstable change after prune @@ -688,11 +688,11 @@ added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) $ hg log -G - o ae45c0c3092a (draft): SPAM SPAM SPAM + o cf306eb0d98f (draft): SPAM SPAM SPAM | - @ 437efbcaf700 (draft): animals + @ 01fddc75bfef (draft): animals | - o ffa278c50818 (draft): bathroom stuff + o 30aa78f63aa1 (draft): bathroom stuff | o a2fccc2e7b08 (public): SPAM SPAM | @@ -707,9 +707,9 @@ In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset: - $ hg prune 437efbcaf700 + $ hg prune 01fddc75bfef 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory now at ffa278c50818 + working directory now at 30aa78f63aa1 1 new unstable changesets @@ -717,11 +717,11 @@ is neither dead or obsolete. My repository is in an unstable state again. $ hg log -G - o ae45c0c3092a (draft): SPAM SPAM SPAM + o cf306eb0d98f (draft): SPAM SPAM SPAM | - x 437efbcaf700 (draft): animals + x 01fddc75bfef (draft): animals | - @ ffa278c50818 (draft): bathroom stuff + @ 30aa78f63aa1 (draft): bathroom stuff | o a2fccc2e7b08 (public): SPAM SPAM | @@ -735,7 +735,7 @@ $ hg log -r 'unstable()' - ae45c0c3092a (draft): SPAM SPAM SPAM + cf306eb0d98f (draft): SPAM SPAM SPAM $ hg evolve move:[17] SPAM SPAM SPAM @@ -743,9 +743,9 @@ merging shopping $ hg log -G - @ d6717f710962 (draft): SPAM SPAM SPAM + @ 7e0a7cf763e4 (draft): SPAM SPAM SPAM | - o ffa278c50818 (draft): bathroom stuff + o 30aa78f63aa1 (draft): bathroom stuff | o a2fccc2e7b08 (public): SPAM SPAM |