Mercurial > evolve
changeset 3987:b802003ffb50 stable
prune: move help about biject after the one about split and fold
The --biject flag seems a less common use case.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 21 Aug 2018 12:21:59 +0200 |
| parents | d8b0086a11a1 |
| children | 3e4fbda6bdce |
| files | hgext3rd/evolve/cmdrewrite.py |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/cmdrewrite.py Tue Aug 21 12:18:11 2018 +0200 +++ b/hgext3rd/evolve/cmdrewrite.py Tue Aug 21 12:21:59 2018 +0200 @@ -967,14 +967,14 @@ 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. + 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 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. """ _checknotesize(ui, opts) revs = scmutil.revrange(repo, list(revs) + opts.get('rev'))