Mercurial > public > mercurial-scm > hg-stable

diff mercurial/rewriteutil.py @ 47381:8125bcd28a5c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 01 Jun 2021 22:38:29 -0700
parents 055f7b9f2307
children debc29900b97
line wrap: on
line diff
--- 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,