rewriteutil: add pointer to help text when rewrite would cause divergence
The evolve extension's version of the hint has this pointer. I missed
it when I moved it to core. This is pretty much the same as
D10723. Turns out I missed two places :(
Differential Revision: https://phab.mercurial-scm.org/D10832
--- a/mercurial/rewriteutil.py Tue May 25 09:20:30 2021 +0200
+++ b/mercurial/rewriteutil.py Tue Jun 01 22:38:29 2021 -0700
@@ -111,7 +111,12 @@
b' set experimental.evolution.allowdivergence=True to '
b'skip this check'
) % (base_ctx, other_ctx, local_ctx)
- raise error.InputError(msg)
+ raise error.InputError(
+ msg,
+ hint=_(
+ b"see 'hg help evolution.instability' for details on content-divergence"
+ ),
+ )
else:
raise error.InputError(
msg,
--- a/tests/test-amend.t Tue May 25 09:20:30 2021 +0200
+++ b/tests/test-amend.t Tue Jun 01 22:38:29 2021 -0700
@@ -241,6 +241,13 @@
abort: cannot amend 112478962961, as that creates content-divergence with 16084da537dd
(add --verbose for details or see 'hg help evolution.instability')
[10]
+ $ hg amend -m divergent --verbose
+ abort: cannot amend 112478962961, as that creates content-divergence with 16084da537dd
+ changeset 112478962961 already has a successor in changeset 16084da537dd
+ rewriting changeset 112478962961 would create "content-divergence"
+ set experimental.evolution.allowdivergence=True to skip this check
+ (see 'hg help evolution.instability' for details on content-divergence)
+ [10]
$ hg amend -m divergent --config experimental.evolution.allowdivergence=true
2 new content-divergent changesets
#endif