changeset 767:01a270481a61 stable

tutorial Display the help of appropriate command in section that need writting
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 09 Jan 2014 21:38:28 -0800
parents 32936a9f4389
children b116de5dc70d
files tests/test-tutorial.t
diffstat 1 files changed, 49 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-tutorial.t	Thu Jan 09 15:24:16 2014 -0800
+++ b/tests/test-tutorial.t	Thu Jan 09 21:38:28 2014 -0800
@@ -428,15 +428,60 @@
 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
 
 
 -----------------------