Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-uncommit.t
changeset 3432 f57be161f34b
parent 3417 d3a17c67f85c
child 3559 d166b3dc5e8a 
--- a/tests/test-uncommit.t	Sat Jan 13 14:35:49 2018 -0800
+++ b/tests/test-uncommit.t	Sat Jan 20 11:59:36 2018 +0100
@@ -239,6 +239,7 @@
 
   $ hg up -C 3 --hidden
   updating to a hidden changeset 5eb72dbe0cb4
+  (hidden revision '5eb72dbe0cb4' was rewritten as: e8db4aa611f6)
   8 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (leaving bookmark touncommit-bm)
   working directory parent is obsolete! (5eb72dbe0cb4)
@@ -287,6 +288,7 @@
 
   $ hg up -C 3 --hidden
   updating to a hidden changeset 5eb72dbe0cb4
+  (hidden revision '5eb72dbe0cb4' has diverged)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (5eb72dbe0cb4)
   (5eb72dbe0cb4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
evolve