# HG changeset patch # User Pierre-Yves David # Date 1534846919 -7200 # Node ID b802003ffb506e69dfb443e009e1649f3bdbe4af # Parent d8b0086a11a1c1b4cafa91c18630033d3b356c38 prune: move help about biject after the one about split and fold The --biject flag seems a less common use case. diff -r d8b0086a11a1 -r b802003ffb50 hgext3rd/evolve/cmdrewrite.py --- 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'))