evolve: comparison tests/test-tutorial.t

equal deleted inserted replaced

-:ddbee40be518
+:56733f2ddb04
 o  4d5dc8187023 (draft): adding condiment
 |
 o  7e82d3f3c2cb (public): Monthy Python Shopping list
-hopefully. I can use `hg commit --amend` to rewrite my faulty changeset!
+Hopefully. I can use `hg commit --amend` to rewrite my faulty changeset!
 $ sed -i'' -e s/Bananos/Banana/ shopping
 $ hg diff
 diff --git a/shopping b/shopping
 --- a/shopping
 +Apple
 Getting rid of branchy history
 ----------------------------------
-While I was working on my list. someone made a change remotely.
+While I was working on my list. Someone made a change remotely.
 $ cd ../remote
 $ hg up -q
 $ sed -i'' -e 's/Spam/Spam Spam Spam/' shopping
 $ hg ci -m 'SPAM'
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
-I now have a new heads. Note that this remote head is immutable
+I now have a new head. Note that this remote head is immutable.
 $ hg log -G
 o  9ca060c80d74 (public): SPAM
 |
 | @  9d0363b81950 (draft): adding fruit
 | o  4d5dc8187023 (draft): adding condiment
 |/
 o  7e82d3f3c2cb (public): Monthy Python Shopping list
-instead of merging my head with the new one. I'm going to rebase my work
+Instead of merging my head with the new one. I'm going to rebase my work
 $ hg diff
 $ hg rebase --dest 9ca060c80d74 --source 4d5dc8187023
 rebasing 1:4d5dc8187023 "adding condiment"
 merging shopping
 Removing changesets
 ------------------------
-I add new item to my list
+I add new items to my list.
 $ cat >> shopping << EOF
 > car
 > bus
 > plane
 o  9ca060c80d74 (public): SPAM
 |
 o  7e82d3f3c2cb (public): Monthy Python Shopping list
-I have a new commit but I realize that don't want it. (transport shop list does
+I have a new commit but I realize that don't want it. (Transport shop list does
 not fit well in my standard shopping list)
 $ hg prune . # "." is for working directory parent
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 working directory now at 41aff6a42b75
 -----------------------
 Collaboration
 -----------------------
-sharing mutable changesets
+Sharing mutable changesets
 ----------------------------
 To share mutable changesets with others, just check that the repo you interact
 with is "not publishing". Otherwise you will get the previously observe
 behavior where exchanged changeset are automatically published.
 $ cd ../remote
 $ hg -R ../local/ showconfig phases
 [1]
-the localrepo does not have any specific configuration for `phases.publish`. It
+The localrepo does not have any specific configuration for `phases.publish`. It
 is ``true`` by default.
 $ hg pull local
 pulling from $TESTTMP/local (glob)
 searching for changes
 @  9ca060c80d74 (public): SPAM
 |
 o  7e82d3f3c2cb (public): Monthy Python Shopping list
 We do not want to publish the "bathroom changeset". Let's rollback the last transaction.
 .. Warning: Rollback is actually a dangerous kind of internal command that is deprecated and should not be exposed to user. Please forget you read about it until someone fix this tutorial.
 $ hg rollback
 @  9ca060c80d74 (public): SPAM
 |
 o  7e82d3f3c2cb (public): Monthy Python Shopping list
-Let's make the local repo "non publishing"
+Let's make the local repo "non publishing".
 $ echo '[phases]' >> ../local/.hg/hgrc
 $ echo 'publish=false' >> ../local/.hg/hgrc
 $ echo '[phases]' >> .hg/hgrc
 $ echo 'publish=false' >> .hg/hgrc
 o  9ca060c80d74 (public): SPAM
 |
 o  7e82d3f3c2cb (public): Monthy Python Shopping list
 When we pull from remote again we get an unstable state!
 $ hg pull remote
 pulling from $TESTTMP/remote (glob)
 searching for changes
 abort: push includes unstable changeset: bf1b0d202029!
 (use 'hg evolve' to get a stable history or --force to ignore warnings)
 [255]
 To resolve this unstable state, you need to rebase bf1b0d202029 onto
 a44c85f957d3. The `hg evolve` command will do this for you.
 It has a --dry-run option to only suggest the next move.
 o  9ca060c80d74 (public): SPAM
 |
 o  7e82d3f3c2cb (public): Monthy Python Shopping list
+We can push this evolution to remote.
-We can push this evolution to remote
 $ hg push remote
 pushing to $TESTTMP/remote (glob)
 searching for changes
 adding changesets
 adding file changes
 added 2 changesets with 2 changes to 1 files (+1 heads)
 3 new obsolescence markers
 obsoleted 2 changesets
-remote get a warning that current working directory is based on an obsolete changeset
+Remote get a warning that current working directory is based on an obsolete
+changeset.
 $ cd ../remote
 $ hg pull local # we up again to trigger the warning. it was displayed during the push
 pulling from $TESTTMP/local (glob)
 searching for changes
 no changes found
 working directory parent is obsolete! (bf1b0d202029)
 (use 'hg evolve' to update to its successor: ee942144f952)
-now let's see where we are, and update to the successor
+Now let's see where we are, and update to the successor.
 $ hg parents
 bf1b0d202029 (draft): animals
 working directory parent is obsolete! (bf1b0d202029)
 (use 'hg evolve' to update to its successor: ee942144f952)
 working directory is now at ee942144f952
 Relocating unstable change after prune
 ----------------------------------------------
-The remote guy keep working
+The remote guy keeps working.
 $ sed -i'' -e 's/Spam/Spam Spam Spam Spam/g' shopping
 $ hg commit -m "SPAM SPAM SPAM"
 I'm pulling its work locally.
 1 changesets pruned
 1 new unstable changesets
 The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset
-is neither dead or obsolete.  My repository is in an unstable state again.
+is neither dead or obsolete. My repository is in an unstable state again.
 $ hg log -G
 o  99f039c5ec9e (draft): SPAM SPAM SPAM
 |
 x  ee942144f952 (draft): animals
 |
 o  9ca060c80d74 (public): SPAM
 |
 o  7e82d3f3c2cb (public): Monthy Python Shopping list
 $ hg log -r 'unstable()'
 99f039c5ec9e (draft): SPAM SPAM SPAM
 $ hg evolve
 move:[17] SPAM SPAM SPAM
 |
 o  9ca060c80d74 (public): SPAM
 |
 o  7e82d3f3c2cb (public): Monthy Python Shopping list
 Handling Divergent amend
 ----------------------------------------------
 We can detect that multiple diverging amendments have been made.
 The `evolve` command can solve this situation. But all corner case are not

branch	stable
changeset 2822	56733f2ddb04
parent 2768	85e5a56db776
child 2826	93588d219f2f