diff tests/test-evolve-order.t @ 4577:bcd52ce0916d

evolve: don't update after instability resolution by default (BC)
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 24 Apr 2019 15:59:02 +0200
parents 96ce1030d2fb
children 79bc0f1a832e 1f92a6aa40d6
line wrap: on
line diff
--- a/tests/test-evolve-order.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-evolve-order.t	Wed Apr 24 15:59:02 2019 +0200
@@ -62,12 +62,11 @@
   move:[2] add _b
   atop:[4] add _a
   move:[3] add _c
-  working directory is now at 52b8f9b04f83
 
 evolve --rev reorders the rev to solve instability. Harder case, obsolescence
 accross three stacks in growing rev numbers.
   $ hg up "desc(_c)"
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ mkcommit _d
   $ hg up "desc(_a)"
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
@@ -76,9 +75,8 @@
   $ hg evolve --rev "desc(_b)"
   move:[5] add _b
   atop:[8] aprime
-  working directory is now at 476c9c052aae
   $ hg up "desc(_b) - obsolete()"
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg amend -m "bprime"
   $ hg up "desc(aprime)"
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -204,7 +202,6 @@
   atop:[21] add c1second
   move:[25] add b4_
   atop:[27] add b3prime
-  working directory is now at ea93190a9cd1
 
 Cleanup
   $ hg evolve --rev "(desc(_d)::)" --update
@@ -257,5 +254,3 @@
   move:[29] add b4_
   atop:[34] b3second
   skipping 0b9488394e89: divergent rewriting. can't choose destination
-  working directory is now at 31809a198477
-