Mercurial > evolve
changeset 3988:3e4fbda6bdce stable
prune: try to clarify the "multi" revisions case
I hope this highlight the use case for all three options.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 21 Aug 2018 12:21:05 +0200 |
| parents | b802003ffb50 |
| children | b60113460856 |
| files | hgext3rd/evolve/cmdrewrite.py |
| diffstat | 1 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/cmdrewrite.py Tue Aug 21 12:21:59 2018 +0200 +++ b/hgext3rd/evolve/cmdrewrite.py Tue Aug 21 12:21:05 2018 +0200 @@ -967,14 +967,15 @@ pruned changeset exists. Mercurial records successor revisions in obsolescence markers. - 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. + If you prune a single revision and 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. - You can use the ``--biject`` option to pair the pruned precursor - and successor changesets. This is commonly useful for resolving - history divergence, or when someone else does edits history - without obsolescence enabled. + If you want to supersede multiple revisions at the same time, use + ``--biject`` option to pair the pruned precursor and successor changesets. + This is commonly useful for resolving history divergence, or when someone + else does edits history without obsolescence enabled. """ _checknotesize(ui, opts) revs = scmutil.revrange(repo, list(revs) + opts.get('rev'))