Mercurial > hg

diff tests/test-obsolete.t @ 35571:265cd9e19d26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 02fdb8c018aa
children 7336ac5e786e
line wrap: on
line diff
--- a/tests/test-obsolete.t	Fri Dec 29 03:37:36 2017 +0530
+++ b/tests/test-obsolete.t	Fri Jan 05 09:12:08 2018 +0100
@@ -197,7 +197,7 @@
   abort: unknown revision '6'!
   [255]
   $ hg log -r 4
-  abort: hidden revision '4'!
+  abort: hidden revision '4' was rewritten as: 5601fb93a350!
   (use --hidden to access hidden revisions)
   [255]
   $ hg debugrevspec 'rev(6)'
@@ -1337,7 +1337,7 @@
   4:13bedc178fce (draft *obsolete*) [ bookb] add b [rewritten using amend as 5:a9b1f8652753]
   $ hg book -d bookb
   $ hg log -r 13bedc178fce
-  abort: hidden revision '13bedc178fce'!
+  abort: hidden revision '13bedc178fce' was rewritten as: a9b1f8652753!
   (use --hidden to access hidden revisions)
   [255]