evolve: improve the help of the fold command
The help of the fold command needed a little rework. This patch makes it a
little less verbose and adds an example. It also highlights a little more the
importance of the --exact flag.
--- a/hgext/evolve.py Fri Jun 26 00:05:37 2015 -0700
+++ b/hgext/evolve.py Thu Jun 25 09:53:53 2015 -0700
@@ -2609,9 +2609,8 @@
def fold(ui, repo, *revs, **opts):
"""fold multiple revisions into a single one
- Folds a set of revisions with the parent of the working directory.
- All revisions linearly between the given revisions and the parent
- of the working directory will also be folded.
+ By default, folds all the revisions linearly between the given revisions
+ and the parent of the working directory.
Use --exact for folding only the specified revisions while ignoring the
parent of the working directory. In this case, the given revisions must
@@ -2636,6 +2635,10 @@
hg fold 3:6
+ - Fold revisions 3 and 4:
+
+ hg fold "3 + 4" --exact
+
- Only fold revisions linearly between foo and @::
hg fold foo::@ --exact
--- a/tests/test-tutorial.t Fri Jun 26 00:05:37 2015 -0700
+++ b/tests/test-tutorial.t Thu Jun 25 09:53:53 2015 -0700
@@ -482,9 +482,8 @@
fold multiple revisions into a single one
- Folds a set of revisions with the parent of the working directory. All
- revisions linearly between the given revisions and the parent of the
- working directory will also be folded.
+ By default, folds all the revisions linearly between the given revisions
+ and the parent of the working directory.
Use --exact for folding only the specified revisions while ignoring the
parent of the working directory. In this case, the given revisions must