diff tests/test-evolve-content-divergent-stack.t @ 4577:bcd52ce0916d

evolve: don't update after instability resolution by default (BC)

--- a/tests/test-evolve-content-divergent-stack.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-evolve-content-divergent-stack.t	Wed Apr 24 15:59:02 2019 +0200
@@ -72,15 +72,14 @@
   atop:[6] watbar to a
   move:[3] added c
   move:[4] added d
-  working directory is now at 15c781f93cac
   $ hg glog
-  @  9:15c781f93cac added d
+  o  9:15c781f93cac added d
   |   () [default] draft
   o  8:9e5fb1d5b955 added c
   |   () [default] draft
   o  7:88516dccf68a added b
   |   () [default] draft
-  o  6:82b74d5dc678 watbar to a
+  @  6:82b74d5dc678 watbar to a
   |   () [default] draft
   o  0:8fa14d15e168 added hgignore
       () [default] draft
@@ -96,15 +95,14 @@
   atop:[5] watbar to a
   move:[3] added c
   move:[4] added d
-  working directory is now at c72d2885eb51
   $ hg glog
-  @  8:c72d2885eb51 added d
+  o  8:c72d2885eb51 added d
   |   () [default] draft
   o  7:3ce4be6d8e5e added c
   |   () [default] draft
   o  6:d5f148423c16 added b
   |   () [default] draft
-  o  5:8e222f257bbf watbar to a
+  @  5:8e222f257bbf watbar to a
   |   () [default] draft
   o  0:8fa14d15e168 added hgignore
       () [default] draft
@@ -130,13 +128,13 @@
   |   () [default] draft
   *  9:82b74d5dc678 watbar to a
   |   () [default] draft
-  | @  8:c72d2885eb51 added d
+  | *  8:c72d2885eb51 added d
   | |   () [default] draft
   | *  7:3ce4be6d8e5e added c
   | |   () [default] draft
   | *  6:d5f148423c16 added b
   | |   () [default] draft
-  | *  5:8e222f257bbf watbar to a
+  | @  5:8e222f257bbf watbar to a
   |/    () [default] draft
   o  0:8fa14d15e168 added hgignore
       () [default] draft
@@ -145,7 +143,6 @@
   merge:[5] watbar to a
   with: [9] watbar to a
   base: [1] added a
-  updating to "local" side of the conflict: 8e222f257bbf
   merging "other" content-divergent changeset '82b74d5dc678'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   6 new orphan changesets
@@ -167,16 +164,16 @@
   updating to "local" side of the conflict: c72d2885eb51
   merging "other" content-divergent changeset '15c781f93cac'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 038fe7db3d88
+  working directory is now at f66f262fff6c
 
   $ hg glog
-  @  16:038fe7db3d88 added d
+  o  16:038fe7db3d88 added d
   |   () [default] draft
   o  15:b2cac10f3836 added c
   |   () [default] draft
   o  14:eadfd9d70680 added b
   |   () [default] draft
-  o  13:f66f262fff6c watbar to a
+  @  13:f66f262fff6c watbar to a
   |   () [default] draft
   o  0:8fa14d15e168 added hgignore
       () [default] draft
@@ -270,16 +267,15 @@
   atop:[5] watbar to a
   move:[3] added c
   move:[4] added d
-  working directory is now at c72d2885eb51
 
   $ hg glog
-  @  8:c72d2885eb51 added d
+  o  8:c72d2885eb51 added d
   |   () [default] draft
   o  7:3ce4be6d8e5e added c
   |   () [default] draft
   o  6:d5f148423c16 added b
   |   () [default] draft
-  o  5:8e222f257bbf watbar to a
+  @  5:8e222f257bbf watbar to a
   |   () [default] draft
   o  0:8fa14d15e168 added hgignore
       () [default] draft
@@ -307,13 +303,13 @@
   |   () [default] draft
   o  9:2228e3b74514 add newfile
   |   () [default] draft
-  | @  8:c72d2885eb51 added d
+  | *  8:c72d2885eb51 added d
   | |   () [default] draft
   | *  7:3ce4be6d8e5e added c
   | |   () [default] draft
   | *  6:d5f148423c16 added b
   | |   () [default] draft
-  | *  5:8e222f257bbf watbar to a
+  | @  5:8e222f257bbf watbar to a
   |/    () [default] draft
   o  0:8fa14d15e168 added hgignore
       () [default] draft
@@ -348,16 +344,16 @@
   updating to "local" side of the conflict: d45f050514c2
   merging "other" content-divergent changeset '1d1772990a3b'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 5f7a38bdb75c
+  working directory is now at 74fbf3e6a0b6
 
   $ hg glog
-  @  21:5f7a38bdb75c added d
+  o  21:5f7a38bdb75c added d
   |   () [default] draft
   o  19:9865d598f0e0 added c
   |   () [default] draft
   o  17:ac70b8c8eb63 added b
   |   () [default] draft
-  o  15:74fbf3e6a0b6 watbar to a
+  @  15:74fbf3e6a0b6 watbar to a
   |   () [default] draft
   o  9:2228e3b74514 add newfile
   |   () [default] draft