diff tests/test-stabilize-order.t @ 5826:8c4b3178b32d mercurial-5.4

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

# no-check-commit

--- a/tests/test-stabilize-order.t	Sat Jan 30 20:42:49 2021 +0800
+++ b/tests/test-stabilize-order.t	Thu Mar 11 13:18:30 2021 +0800
@@ -1,6 +1,4 @@
   $ cat >> $HGRCPATH <<EOF
-  > [defaults]
-  > amend=-d "0 0"
   > [extensions]
   > EOF
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
@@ -72,8 +70,8 @@
   b
   committing manifest
   committing changelog
-  resolving manifests
-  removing b
+  resolving manifests (ondisk !)
+  removing b (ondisk !)
   $ glog
   o  6:81b8bbcd5892@default(draft) addb
   |
@@ -95,8 +93,8 @@
   move:[3] addc
   atop:[6] addb
   hg rebase -r 7a7552255fb5 -d 81b8bbcd5892
-  resolving manifests
-  getting b
+  resolving manifests (ondisk !)
+  getting b (ondisk !)
   resolving manifests
   getting c
   committing files:
@@ -157,9 +155,9 @@
   move:[7] addc
   atop:[8] addb
   hg rebase -r 0f691739f917 -d 7a68bc4596ea
-  resolving manifests
-  removing c
-  getting b
+  resolving manifests (ondisk !)
+  removing c (ondisk !)
+  getting b (ondisk !)
   resolving manifests
   getting c
   committing files: