Mercurial > public > mercurial-scm > hg-stable
diff tests/test-directaccess.t @ 35571:265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
When trying to access filtered revision, it is likely because they have been
obsoleted by an obs-marker. The current message shows how to access the
revision anyway:
abort: hidden revision '13bedc178fce'!
But in the case of an obsoleted revision, the user is likely to want to update
to or use the successor of the revision.
We update the message to display more information about the obsolescence fate
of the revision in the following cases:
abort: hidden revision '13bedc178fce' is pruned!
abort: hidden revision '13bedc178fce' has diverged!
abort: hidden revision '13bedc178fce' was rewritten as X, Y and 2 more!
Differential Revision: https://phab.mercurial-scm.org/D1591
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Fri, 05 Jan 2018 09:12:08 +0100 |
| parents | ffd7b7cd309b |
| children | 7336ac5e786e |
line wrap: on
line diff
--- a/tests/test-directaccess.t Fri Dec 29 03:37:36 2017 +0530 +++ b/tests/test-directaccess.t Fri Jan 05 09:12:08 2018 +0100 @@ -40,7 +40,7 @@ Testing with rev number $ hg exp 2 --config experimental.directaccess.revnums=False - abort: hidden revision '2'! + abort: hidden revision '2' was rewritten as: 2443a0e66469! (use --hidden to access hidden revisions) [255] @@ -73,7 +73,7 @@ A c $ hg status --change 2 --config experimental.directaccess.revnums=False - abort: hidden revision '2'! + abort: hidden revision '2' was rewritten as: 2443a0e66469! (use --hidden to access hidden revisions) [255] @@ -178,11 +178,11 @@ Commands with undefined cmdtype should not work right now $ hg phase -r 28ad74 - abort: hidden revision '28ad74'! + abort: hidden revision '28ad74' was rewritten as: 2443a0e66469! (use --hidden to access hidden revisions) [255] $ hg phase -r 2 - abort: hidden revision '2'! + abort: hidden revision '2' was rewritten as: 2443a0e66469! (use --hidden to access hidden revisions) [255]