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-obsolete.t
changeset 3432 f57be161f34b
parent 3431 2e703ed1c713
child 3519 2823c82ad8a4 
--- a/tests/test-obsolete.t	Sat Jan 13 14:35:49 2018 -0800
+++ b/tests/test-obsolete.t	Sat Jan 20 11:59:36 2018 +0100
@@ -122,6 +122,7 @@
   - 725c380fe99b
   $ hg up --hidden 3 -q
   updating to a hidden changeset 0d3f46688ccc
+  (hidden revision '0d3f46688ccc' was rewritten as: 725c380fe99b)
   working directory parent is obsolete! (0d3f46688ccc)
 (reported by parents too)
   $ hg parents
@@ -707,6 +708,7 @@
 
   $ hg up --hidden 3 -q
   updating to a hidden changeset 0d3f46688ccc
+  (hidden revision '0d3f46688ccc' has diverged)
   working directory parent is obsolete! (0d3f46688ccc)
   $ hg evolve
   parent is obsolete with multiple successors:
@@ -726,6 +728,7 @@
 
   $ hg up --hidden 2
   updating to a hidden changeset 4538525df7e2
+  (hidden revision '4538525df7e2' has diverged)
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory parent is obsolete! (4538525df7e2)
   (4538525df7e2 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
evolve