--- a/hgext3rd/evolve/cmdrewrite.py Thu Sep 12 12:35:42 2019 +0200
+++ b/hgext3rd/evolve/cmdrewrite.py Tue Sep 24 12:42:27 2019 +0200
@@ -762,14 +762,6 @@
ui.write_err(_(b'single revision specified, nothing to fold\n'))
return 1
- if not ui.configbool(b'experimental', b'evolution.allowdivergence'):
- for rev in revs:
- if repo[rev].obsolete():
- msg = _(b'folding obsolete revisions may cause divergence')
- hint = _(b'set experimental.evolution.allowdivergence=yes'
- b' to allow folding them')
- raise error.Abort(msg, hint=hint)
-
# Sort so combined commit message of `hg fold --exact -r . -r .^` is
# in topological order.
revs.sort()
@@ -1013,6 +1005,12 @@
``--pair`` option to pair the pruned precursor and successor changesets.
This is commonly useful for resolving history divergence, or when someone
else edits history without obsolescence enabled.
+
+ .. container:: verbose
+
+ ``hg prune A::B -s C::D --pair`` will mark all revisions in the A::B
+ range as superseded by the revisions in C::D. Both revsets need to have
+ the same number of changesets.
"""
_checknotesize(ui, opts)
revs = scmutil.revrange(repo, list(revs) + opts.get('rev'))