diff tests/test-evolve-content-divergent-basic.t @ 5834:c2484b0217ee mercurial-4.6

test-compat: merge mercurial-4.7 into mercurial-4.6

# no-check-commit

--- a/tests/test-evolve-content-divergent-basic.t	Thu Mar 11 14:48:12 2021 +0800
+++ b/tests/test-evolve-content-divergent-basic.t	Thu Mar 11 14:49:22 2021 +0800
@@ -198,9 +198,9 @@
   changed branch on 1 changesets
 
   $ hg up c41c793e0ef1 --hidden
+  updating to a hidden changeset c41c793e0ef1
+  (hidden revision 'c41c793e0ef1' was rewritten as: 9e5dffcb3d48)
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to hidden changeset c41c793e0ef1
-  (hidden revision 'c41c793e0ef1' was rewritten as: 9e5dffcb3d48)
   working directory parent is obsolete! (c41c793e0ef1)
   (use 'hg evolve' to update to its successor: 9e5dffcb3d48)
   $ echo bar > d
@@ -304,9 +304,9 @@
   $ hg amend -m "foo to d"
 
   $ hg up 'predecessors(.)' --hidden
+  updating to a hidden changeset 34e78e1673c1
+  (hidden revision '34e78e1673c1' was rewritten as: c9d0d72972b0)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to hidden changeset 34e78e1673c1
-  (hidden revision '34e78e1673c1' was rewritten as: c9d0d72972b0)
   working directory parent is obsolete! (34e78e1673c1)
   (use 'hg evolve' to update to its successor: c9d0d72972b0)
   $ echo babar > d
@@ -364,9 +364,9 @@
   $ hg amend -m "bar to d, expect beers"
 
   $ hg up 'predecessors(.)' --hidden
+  updating to a hidden changeset cfd599de811a
+  (hidden revision 'cfd599de811a' was rewritten as: ba0941ffb747)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to hidden changeset cfd599de811a
-  (hidden revision 'cfd599de811a' was rewritten as: ba0941ffb747)
   working directory parent is obsolete! (cfd599de811a)
   (use 'hg evolve' to update to its successor: ba0941ffb747)
   $ echo wat > d
@@ -474,9 +474,9 @@
   $ echo 'babar' >> a
   $ hg amend
   $ hg up --hidden 'min(desc("More addition"))'
+  updating to a hidden changeset 867e43582046
+  (hidden revision '867e43582046' was rewritten as: fc6349f931da)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to hidden changeset 867e43582046
-  (hidden revision '867e43582046' was rewritten as: fc6349f931da)
   working directory parent is obsolete! (867e43582046)
   (use 'hg evolve' to update to its successor: fc6349f931da)
   $ mv a a.old
@@ -567,9 +567,9 @@
 
 
   $ hg up --hidden 'min(desc("More addition"))'
+  updating to a hidden changeset 867e43582046
+  (hidden revision '867e43582046' was rewritten as: 6aa6f90a9f68)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to hidden changeset 867e43582046
-  (hidden revision '867e43582046' was rewritten as: 6aa6f90a9f68)
   working directory parent is obsolete! (867e43582046)
   (use 'hg evolve' to update to its successor: 6aa6f90a9f68)
   $ echo 'gotta break' >> a
@@ -744,9 +744,9 @@
   > EOF
   $ hg commit --amend -m E2
   $ hg --hidden update -r 'desc(E1)'
+  updating to a hidden changeset 4a250e5bd992
+  (hidden revision '4a250e5bd992' was rewritten as: 084ae625fa51)
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to hidden changeset 4a250e5bd992
-  (hidden revision '4a250e5bd992' was rewritten as: 084ae625fa51)
   working directory parent is obsolete! (4a250e5bd992)
   (use 'hg evolve' to update to its successor: 084ae625fa51)
   $ cat << EOF > numbers