Mercurial > hg > evolve
changeset 1559:71a3aa0349c5 stable
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.
| author | Laurent Charignon <lcharignon@fb.com> |
|---|---|
| date | Thu, 25 Jun 2015 09:53:53 -0700 |
| parents | dd89ed2bb77e |
| children | d830d4e9f212 |
| files | hgext/evolve.py tests/test-tutorial.t |
| diffstat | 2 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/evolve.py +++ b/hgext/evolve.py @@ -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 +++ b/tests/test-tutorial.t @@ -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