[Updated] D10723: rewriteutil: add pointer to help text when rewrite would cause divergence

[martinvonz (Martin von Zweigbergk)]

Closed by commit rHG055f7b9f2307: rewriteutil: add pointer to help text when rewrite would cause divergence (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D10723?vs=28061&id=28071

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D10723/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D10723

AFFECTED FILES
  mercurial/rewriteutil.py
  tests/test-amend.t
  tests/test-branch-change.t

CHANGE DETAILS

diff --git a/tests/test-branch-change.t b/tests/test-branch-change.t
--- a/tests/test-branch-change.t
+++ b/tests/test-branch-change.t
@@ -151,7 +151,7 @@
 
   $ hg branch -r 4 --hidden foobar
   abort: cannot change branch of 3938acfb5c0f, as that creates content-divergence with 7c1991464886
-  (add --verbose for details)
+  (add --verbose for details or see 'hg help evolution.instability')
   [10]
 
 Make sure bookmark movement is correct
diff --git a/tests/test-amend.t b/tests/test-amend.t
--- a/tests/test-amend.t
+++ b/tests/test-amend.t
@@ -239,7 +239,7 @@
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg amend -m divergent
   abort: cannot amend 112478962961, as that creates content-divergence with 16084da537dd
-  (add --verbose for details)
+  (add --verbose for details or see 'hg help evolution.instability')
   [10]
   $ hg amend -m divergent --config experimental.evolution.allowdivergence=true
   2 new content-divergent changesets
diff --git a/mercurial/rewriteutil.py b/mercurial/rewriteutil.py
--- a/mercurial/rewriteutil.py
+++ b/mercurial/rewriteutil.py
@@ -114,7 +114,11 @@
                 raise error.InputError(msg)
             else:
                 raise error.InputError(
-                    msg, hint=_(b"add --verbose for details")
+                    msg,
+                    hint=_(
+                        b"add --verbose for details or see "
+                        b"'hg help evolution.instability'"
+                    ),
                 )
 
 



To: martinvonz, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210518/1176cf8c/attachment-0002.html>