Mercurial > evolve
changeset 3986:d8b0086a11a1 stable
prune: no longer consider dropping --biject
Field testing show it save people one wrong call often enough that it is worth
keeping.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 21 Aug 2018 12:18:11 +0200 |
parents | ec57afdbe054 |
children | b802003ffb50 |
files | hgext3rd/evolve/cmdrewrite.py |
diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/cmdrewrite.py Tue Aug 21 12:13:01 2018 +0200 +++ b/hgext3rd/evolve/cmdrewrite.py Tue Aug 21 12:18:11 2018 +0200 @@ -970,8 +970,7 @@ 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. (This option may be removed in a - future release with the functionality provided automatically.) + 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