Mercurial > evolve
diff tests/test-tutorial.t @ 6931:237f99ee3d64 stable
tests: remove leading spaces in `hg help` output, run only on Mercurial 6.9+
Core decided to remove a lot of leading spaces in docstrings to support Python
3.13, see 51057ab0dffa for details.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Mon, 11 Nov 2024 10:39:57 +0400 |
parents | 45cbf0af48e7 |
children |
line wrap: on
line diff
--- a/tests/test-tutorial.t Mon Nov 11 10:38:20 2024 +0400 +++ b/tests/test-tutorial.t Mon Nov 11 10:39:57 2024 +0400 @@ -910,24 +910,25 @@ This part is not written yet, but you can use either the `histedit` extension or the `uncommit` command to split a change. +#if hg69 $ hg help uncommit hg uncommit [OPTION]... [FILE]... move changes from parent revision to working directory - Changes to selected files in the checked out revision appear again as - uncommitted changed in the working directory. A new revision without the - selected changes is created, becomes the checked out revision, and - obsoletes the previous one. + Changes to selected files in the checked out revision appear again as + uncommitted changed in the working directory. A new revision without the + selected changes is created, becomes the checked out revision, and obsoletes + the previous one. - The --include option specifies patterns to uncommit. The --exclude option - specifies patterns to keep in the commit. + The --include option specifies patterns to uncommit. The --exclude option + specifies patterns to keep in the commit. - The --rev argument let you change the commit file to a content of another - revision. It still does not change the content of your file in the working - directory. + The --rev argument let you change the commit file to a content of another + revision. It still does not change the content of your file in the working + directory. - Return 0 if changed files are uncommitted. + Return 0 if changed files are uncommitted. options ([+] can be repeated): @@ -945,6 +946,7 @@ -U --current-user record the current user as committer (some details hidden, use --verbose to show complete help) +#endif The edit command of histedit can be used to split changeset: @@ -955,6 +957,7 @@ The tutorial part is not written yet but can use `hg fold`: +#if hg69 $ hg help fold hg fold [OPTION]... [-r] REV... @@ -962,12 +965,12 @@ fold multiple revisions into a single one - With --from, folds all the revisions linearly between the given revisions - and the parent of the working directory. + With --from, folds all the revisions linearly between the given revisions and + the parent of the working directory. - With --exact, folds only the specified revisions while ignoring the parent - of the working directory. In this case, the given revisions must form a - linear unbroken chain. + With --exact, folds only the specified revisions while ignoring the parent of + the working directory. In this case, the given revisions must form a linear + unbroken chain. options ([+] can be repeated): @@ -983,6 +986,7 @@ -U --current-user record the current user as committer (some details hidden, use --verbose to show complete help) +#endif -----------------------