evolve: comparison tests/test-tutorial.t

equal deleted inserted replaced

-:966e2659e989
+:0961a7eb82c4
 This Mercurial configuration example is used for testing.
 .. Various setup
 $ cat >> $HGRCPATH << EOF
 > [ui]
+> # This is change the default output of log for clear tutorial
 > logtemplate ="{node|short} ({phase}): {desc}\n"
 > [diff]
+> # use "git" diff format, clearer and smarter format
 > git = 1
 > [alias]
 > # "-d '0 0'" means that the new commit will be at January 1st 1970.
 > # This is used for stable hash during test
+> # (this tutorial is automatically tested.)
 > amend = amend -d '0 0'
 > EOF
 $ hg init local
 $ cat >> local/.hg/hgrc << EOF
 This tutorial uses the following configuration for Mercurial:
 A compact log template with phase data:
-$ hg showconfig ui
+$ hg showconfig ui | grep log
-ui.slash=True
 ui.logtemplate="{node|short} ({phase}): {desc}\n"
 Improved git format diff:
 $ hg showconfig diff
 And of course, we enable the experimental extensions for mutable history:
 $ cat >> $HGRCPATH <<EOF
 > [extensions]
+> evolve = $TESTDIR/../hgext/evolve.py
+> # enabling rebase is also needed for now
 > rebase =
-> evolve = $TESTDIR/../hgext/evolve.py
 > EOF
 -----------------------
 Single Developer Usage
 -----------------------
 +Apple
 Getting rid of branchy history
 ----------------------------------
-While I was working on my list. someone help made a change remotly.
+While I was working on my list. someone made a change remotly.
 $ cd ../remote
 $ hg up -q
 $ sed -i'' -e 's/Spam/Spam Spam Spam/' shopping
 $ hg ci -m 'SPAM'
 instead of merging my head with the new one. I'm going to rebase my work
 $ hg diff
-$ hg rebase -d 9ca060c80d74 -s 4d5dc8187023
+$ hg rebase --dest 9ca060c80d74 --source 4d5dc8187023
 merging shopping
 merging shopping
 My local work is now rebased on the remote one.
 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
+$ hg prune . # "." is for working directory parent
 1 changesets pruned
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 working directory now at 41aff6a42b75
 The silly changeset is gone.
 o  9ca060c80d74 (public): SPAM
 |
 o  7e82d3f3c2cb (public): Monthy Python Shopping list
-.. note: We can't amend changeset 7e82d3f3c2cb or 9ca060c80d74 as they are immutable.
+.. note:: We can't amend changeset 7e82d3f3c2cb or 9ca060c80d74 as they are immutable.
-I now want to push to remote all my changes except the bathroom one, which I'm not
+I now want to push to remote all my changes except the bathroom one, which I'm
-totally happy with yet. To be able to push "SPAM SPAM" I need a version of "SPAM SPAM" which is not a child of
+not totally happy with yet. To be able to push "SPAM SPAM" I need a version of
-"bathroom stuff"
+"SPAM SPAM" which is not a child of "bathroom stuff"
-You can use 'rebase -r' or 'grab' for that:
+You can use the 'grab' alias for that.
+.. note: grab is an alias for `hg rebase --dest . --rev <target>; hg up <there>`
 $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ hg rebase --rev fac207dec9f5 --dest . # moving "SPAM SPAM" to the working directory parent
+$ hg grab fac207dec9f5 # moving "SPAM SPAM" to the working directory parent
 merging shopping
-$ hg up tip
 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob)
 $ hg log -G
 @  a224f2a4fb9f (draft): SPAM SPAM
 |
 | o  10b8aeaa8cc8 (draft): bathroom stuff
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 3 changes to 1 files
-for simplicity shake we get the bathroom change in line again
+for simplicity sake we get the bathroom change in line again
-$ hg rebase -r 10b8aeaa8cc8 -d a224f2a4fb9f
+$ hg grab 10b8aeaa8cc8
 merging shopping
-$ hg up tip
 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob)
 $ hg phase --draft .
 $ hg log -G
 @  75954b8cd933 (draft): bathroom stuff
 |
 Splitting change
 ------------------
-histedit or uncommit
+This part is not written yet, but you can use either the `histedit` extension
+of the `uncommit` command to splitting a change.
+$ hg help uncommit
+hg uncommit [OPTION]... [NAME]
+move changes from parent revision to working directory
+Changes to selected files in parent revision appear again as uncommitted
+changed in the working directory. A new revision without selected changes
+is created, becomes the new parent and obsoletes the previous one.
+The --include option specify pattern to uncommit The --exclude option
+specify pattern to keep in the commit
+Return 0 if changed files are uncommitted.
+options:
+-a --all                 uncommit all changes when no arguments given
+-I --include PATTERN [+] include names matching the given patterns
+-X --exclude PATTERN [+] exclude names matching the given patterns
+[+] marked option can be specified multiple times
+use "hg -v help uncommit" to show the global options
+The edit command of histedit can be used to split changeset:
 Collapsing change
 ------------------
-This can be done with hg fold but the tutorial part is not written yet.
+The tutorial part is not written yet but can use `hg fold`:
+$ hg help fold
+hg fold rev
+Fold multiple revisions into a single one
+Revision from your current working directory to the specified one are fold
+as a new one replacing the other
+you can alternatively use --rev to explicitly specify revision to be fold
+ignoring the current working directory parent.
+options:
+-r --rev VALUE [+] explicitly specify the full set of revision to fold
+[+] marked option can be specified multiple times
+use "hg -v help fold" to show the global options
 -----------------------
 Collaboration
 -----------------------
-sharing mutable changeset
+sharing mutable changesets
 ----------------------------
-To share mutable changeset with others, just check that the repo you interact
+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
 o  7e82d3f3c2cb (public): Monthy Python Shopping list
-We do not want to publish the "bathroom changeset". Let's rollback the last transaction
+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
 repository tip rolled back to revision 4 (undo pull)
 $ hg log -G
 o  a224f2a4fb9f (public): SPAM SPAM
 When we pull from remote again we get an unstable state!
 $ hg pull remote
 pulling from $TESTTMP/remote
 searching for changes
 adding changesets
 adding manifests
 To resolve this unstable state, you need to rebase bf1b0d202029 onto
-a44c85f957d3. The "hg evolve" command will do this for you.
+a44c85f957d3. The `hg evolve` command will do this for you.
 It has a --dry-run option to only suggest the next move.
 $ hg evolve --dry-run
 move:[15] animals
 |
 o  7e82d3f3c2cb (public): Monthy Python Shopping list
-Handling Conflicting amend
+Handling Divergent amend
 ----------------------------------------------
-We can detect that multiple diverging/conflicting amendments have been made. There
+We can detect that multiple diverging/conflicting amendments have been made.
-will be a "evol-merge" command to merge conflicting amendments.
+The `evolve` command can solve this situation. But all corner case are not
+handled now.
 This section needs to be written.

changeset 775	0961a7eb82c4
parent 774	03844e1fbfe6
child 803	b96d51a357bd