tests/test-evolve-obshistory-content-divergent.t
branchmercurial-4.6
changeset 5163 1752a2e7a226
parent 3909 f7afd3a158e3
parent 5125 ce8479d1a6f9
child 5368 844b1ad5b34b
--- a/tests/test-evolve-obshistory-content-divergent.t	Sat Feb 29 15:17:31 2020 +0700
+++ b/tests/test-evolve-obshistory-content-divergent.t	Sat Feb 29 15:18:00 2020 +0700
@@ -41,9 +41,9 @@
      summary:     ROOT
   
   $ hg update --hidden 'desc(A0)'
+  updating to a hidden changeset 471f378eab4c
+  (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to hidden changeset 471f378eab4c
-  (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: fdf9bde5129a)
   $ hg amend -m "A2"
@@ -337,8 +337,8 @@
   (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'desc(A0)'
+  updating to a hidden changeset 471f378eab4c
+  (hidden revision '471f378eab4c' has diverged)
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to hidden changeset 471f378eab4c
-  (hidden revision '471f378eab4c' has diverged)
   working directory parent is obsolete! (471f378eab4c)
   (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)