Mercurial > hg-stable
changeset 47282:055f7b9f2307
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.
Differential Revision: https://phab.mercurial-scm.org/D10723
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 17 May 2021 15:15:44 -0700 |
| parents | 25ce16bf724b |
| children | a671832a8e41 |
| files | mercurial/rewriteutil.py tests/test-amend.t tests/test-branch-change.t |
| diffstat | 3 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/rewriteutil.py Tue May 04 11:20:10 2021 +0200 +++ b/mercurial/rewriteutil.py Mon May 17 15:15:44 2021 -0700 @@ -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'" + ), )
--- a/tests/test-amend.t Tue May 04 11:20:10 2021 +0200 +++ b/tests/test-amend.t Mon May 17 15:15:44 2021 -0700 @@ -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
--- a/tests/test-branch-change.t Tue May 04 11:20:10 2021 +0200 +++ b/tests/test-branch-change.t Mon May 17 15:15:44 2021 -0700 @@ -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