Mercurial > evolve
changeset 3984:33f795a17622 stable
prune: use ``-s/--succ`` in documentation
Extracted by Pierre-Yves David
| author | Dan Villiom Podlaski Christiansen <dan@magenta.dk> |
|---|---|
| date | Tue, 21 Aug 2018 11:56:49 +0200 |
| parents | b4d0245c7f40 |
| children | ec57afdbe054 |
| files | hgext3rd/evolve/cmdrewrite.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/cmdrewrite.py Mon Aug 20 12:21:39 2018 +0300 +++ b/hgext3rd/evolve/cmdrewrite.py Tue Aug 21 11:56:49 2018 +0200 @@ -963,7 +963,7 @@ When you prune the parent of your working copy, Mercurial updates the working copy to a non-obsolete parent. - You can use ``--succ`` to tell Mercurial that a newer version (successor) of the + You can use ``-s/--succ`` to tell Mercurial that a newer version (successor) of the pruned changeset exists. Mercurial records successor revisions in obsolescence markers. @@ -971,7 +971,7 @@ revisions to pruned (precursor) and successor changesets. This option may be removed in a future release (with the functionality provided automatically). - If you specify multiple revisions in ``--succ``, you are recording a "split" and + If you specify multiple revisions in ``-s/--succ``, you are recording a "split" and must acknowledge it by passing ``--split``. Similarly, when you prune multiple changesets with a single successor, you must pass the ``--fold`` option. """