tests/test-uncommit.t
branchmercurial-3.8
changeset 2320 979a8ea17e1e
parent 2111 ec04eb4d2c6e
parent 2289 61d073590fb7
child 2598 5415041a959a
--- a/tests/test-uncommit.t	Thu Apr 20 12:50:22 2017 +0200
+++ b/tests/test-uncommit.t	Wed May 03 13:52:19 2017 +0200
@@ -239,8 +239,8 @@
   $ hg up -C 3 --hidden
   8 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (leaving bookmark touncommit-bm)
-  working directory parent is obsolete!
-  (use 'hg evolve' to update to its successor)
+  working directory parent is obsolete! (5eb72dbe0cb4)
+  (use 'hg evolve' to update to its successor: e8db4aa611f6)
   $ hg --config extensions.purge= purge
   $ hg uncommit -I 'set:added() and e'
   2 new divergent changesets
@@ -285,8 +285,8 @@
 
   $ hg up -C 3 --hidden
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory parent is obsolete!
-  (use 'hg evolve' to update to its successor)
+  working directory parent is obsolete! (5eb72dbe0cb4)
+  (5eb72dbe0cb4 has diverged, use 'hg evolve -list --divergent' to resolve the issue)
   $ hg --config extensions.purge= purge
   $ hg uncommit --all -X e
   1 new divergent changesets