diff tests/test-stabilize-order.t @ 6396:e5bd76f95145 mercurial-5.5

test-compat: merge mercurial-5.6 into mercurial-5.5

--- a/tests/test-stabilize-order.t	Thu Dec 08 20:35:02 2022 +0400
+++ b/tests/test-stabilize-order.t	Mon Feb 06 21:38:31 2023 +0400
@@ -70,10 +70,10 @@
   b
   committing manifest
   committing changelog
-  resolving manifests (ondisk !)
-  removing b (ondisk !)
+  resolving manifests
+  removing b
   $ glog
-  o  6:81b8bbcd5892@default(draft) addb
+  o  6:bede829dd2d3@default(draft) addb
   |
   @  5:005fe5914f78@default(draft) adda
   |
@@ -92,16 +92,16 @@
   $ hg evolve -v --update
   move:[3] addc
   atop:[6] addb
-  hg rebase -r 7a7552255fb5 -d 81b8bbcd5892
-  resolving manifests (ondisk !)
-  getting b (ondisk !)
+  hg rebase -r 7a7552255fb5 -d bede829dd2d3
+  resolving manifests
+  getting b
   resolving manifests
   getting c
   committing files:
   c
   committing manifest
   committing changelog
-  working directory is now at 0f691739f917
+  working directory is now at 65095d7d0dd5
   $ hg debugobsolete > successors.new
   $ diff -u successors.old successors.new
   --- successors.old* (glob)
@@ -109,16 +109,16 @@
   @@ -1,3 +1,4 @@
    ef23d6ef94d68dea65d20587dfecc8b33d165617 22619daeed78036f80fbd326b6852519c4f0c25e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
    93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
-   22619daeed78036f80fbd326b6852519c4f0c25e 81b8bbcd5892841efed41433d7a5e9df922396cb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
-  +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 0f691739f91762462bf8ba21f35fdf71fe64310e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+   22619daeed78036f80fbd326b6852519c4f0c25e bede829dd2d3b2ae9bf198c23432b250dc964458 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+  +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 65095d7d0dd5e4f15503bb7b1f433a5fe9bac052 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
   [1]
 
 
 
   $ glog
-  @  7:0f691739f917@default(draft) addc
+  @  7:65095d7d0dd5@default(draft) addc
   |
-  o  6:81b8bbcd5892@default(draft) addb
+  o  6:bede829dd2d3@default(draft) addb
   |
   o  5:005fe5914f78@default(draft) adda
   |
@@ -129,23 +129,23 @@
 
 Test behavior with --any
 
-  $ hg up 81b8bbcd5892
+  $ hg up bede829dd2d3
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo b >> b
   $ hg amend
   1 new orphan changesets
   $ glog
-  @  8:7a68bc4596ea@default(draft) addb
+  @  8:036cf654e942@default(draft) addb
   |
-  | *  7:0f691739f917@default(draft) addc
+  | *  7:65095d7d0dd5@default(draft) addc
   | |
-  | x  6:81b8bbcd5892@default(draft) addb
+  | x  6:bede829dd2d3@default(draft) addb
   |/
   o  5:005fe5914f78@default(draft) adda
   |
   o  0:c471ef929e6a@default(draft) addroot
   
-  $ hg up 0f691739f917
+  $ hg up 65095d7d0dd5
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg evolve -v
   nothing to evolve on current working copy parent
@@ -154,21 +154,21 @@
   $ hg evolve --any -v
   move:[7] addc
   atop:[8] addb
-  hg rebase -r 0f691739f917 -d 7a68bc4596ea
-  resolving manifests (ondisk !)
-  removing c (ondisk !)
-  getting b (ondisk !)
+  hg rebase -r 65095d7d0dd5 -d 036cf654e942
+  resolving manifests
+  removing c
+  getting b
   resolving manifests
   getting c
   committing files:
   c
   committing manifest
   committing changelog
-  working directory is now at 2256dae6521f
+  working directory is now at e99ecf51c867
   $ glog
-  @  9:2256dae6521f@default(draft) addc
+  @  9:e99ecf51c867@default(draft) addc
   |
-  o  8:7a68bc4596ea@default(draft) addb
+  o  8:036cf654e942@default(draft) addb
   |
   o  5:005fe5914f78@default(draft) adda
   |
@@ -193,33 +193,33 @@
   $ hg commit --amend -m "newmessage"
   2 new orphan changesets
   $ hg log -G
-  @  changeset:   12:f83a0bce03e4
+  @  changeset:   12:49773ccde390
   |  tag:         tip
-  |  parent:      8:7a68bc4596ea
+  |  parent:      8:036cf654e942
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     newmessage
   |
-  | *  changeset:   11:fa68011f392e
-  | |  parent:      9:2256dae6521f
+  | *  changeset:   11:a9892777b519
+  | |  parent:      9:e99ecf51c867
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: orphan
   | |  summary:     secondambiguous
   | |
-  | | *  changeset:   10:bdc003b6eec2
+  | | *  changeset:   10:0b6e26b2472d
   | |/   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
   | |    instability: orphan
   | |    summary:     firstambiguous
   | |
-  | x  changeset:   9:2256dae6521f
+  | x  changeset:   9:e99ecf51c867
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded using amend as 12:f83a0bce03e4
+  |    obsolete:    reworded using amend as 12:49773ccde390
   |    summary:     addc
   |
-  o  changeset:   8:7a68bc4596ea
+  o  changeset:   8:036cf654e942
   |  parent:      5:005fe5914f78
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000