Mercurial > evolve

changeset 4577:bcd52ce0916d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 75e76141cba2
files CHANGELOG hgext3rd/evolve/evolvecmd.py tests/test-evolve-content-divergent-meta.t tests/test-evolve-content-divergent-relocation.t tests/test-evolve-content-divergent-stack.t tests/test-evolve-continue.t tests/test-evolve-issue5832.t tests/test-evolve-issue5881.t tests/test-evolve-issue5966.t tests/test-evolve-noupdate.t tests/test-evolve-order.t tests/test-evolve-orphan-split.t tests/test-evolve-phase-divergence.t tests/test-evolve-phase.t tests/test-evolve-public-content-divergent-main.t tests/test-evolve-split.t tests/test-evolve-stop-orphan.t tests/test-evolve-topic.t tests/test-evolve.t tests/test-issue-5720.t tests/test-split.t tests/test-stabilize-order.t tests/test-topic-stack-complex.t tests/test-tutorial.t tests/test-unstable-orphan.t
diffstat 25 files changed, 98 insertions(+), 132 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGELOG	Sun Apr 14 02:18:19 2019 +0800
+++ b/CHANGELOG	Wed Apr 24 15:59:02 2019 +0200
@@ -4,6 +4,8 @@
 8.6.0 - in progress
 -------------------
 
+  * evolve: preserve the working directory after resolving instability (BC)
+            (use `hg next` or `hg evolve --no-update` to get the old behavior)
   * evolve: drop compatibility with 4.4
   * evolve: reinstalled compatibility with narrow repositories,
 
--- a/hgext3rd/evolve/evolvecmd.py	Sun Apr 14 02:18:19 2019 +0800
+++ b/hgext3rd/evolve/evolvecmd.py	Wed Apr 24 15:59:02 2019 +0200
@@ -1475,7 +1475,7 @@
      ('', 'orphan', False, _('solves only orphan changesets (default)')),
      ('a', 'all', False, _('evolve all troubled changesets related to the '
                            'current  working directory and its descendants')),
-     ('', 'update', True, _('update to the head of evolved changesets')),
+     ('', 'update', False, _('update to the head of evolved changesets')),
      ('c', 'continue', False, _('continue an interrupted evolution')),
      ('', 'stop', False, _('stop the interrupted evolution')),
      ('', 'abort', False, _('abort the interrupted evolution')),
--- a/tests/test-evolve-content-divergent-meta.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-evolve-content-divergent-meta.t	Wed Apr 24 15:59:02 2019 +0200
@@ -89,7 +89,6 @@
   updating to "local" side of the conflict: 0c9267e23c9d
   merging "other" content-divergent changeset '6c06cda6dc99'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 443bd2972210
 
 Make sure resultant cset don't replace the initial user with user running the command:
   $ hg log -r tip
--- a/tests/test-evolve-content-divergent-relocation.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-evolve-content-divergent-relocation.t	Wed Apr 24 15:59:02 2019 +0200
@@ -109,13 +109,12 @@
   move:[3] added c
   atop:[8] added b
   move:[4] added d
-  working directory is now at 4ae4427ee9f8
   $ hg glog
-  @  10:4ae4427ee9f8 added d
+  o  10:4ae4427ee9f8 added d
   |   () [default] draft
   o  9:917281f93fcb added c
   |   () [default] draft
-  o  8:171614c9a791 added b
+  @  8:171614c9a791 added b
   |   () [default] draft
   o  1:c7586e2a9264 added a
   |   () [default] draft
@@ -124,8 +123,6 @@
 
 More testing!
 
-  $ hg up .^^
-  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo x > x
   $ hg ci -Aqm "added x"
   $ hg glog -r .
--- 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
--- a/tests/test-evolve-continue.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-evolve-continue.t	Wed Apr 24 15:59:02 2019 +0200
@@ -31,7 +31,7 @@
   o  0:8fa14d15e168 added hgignore
       () draft
 
-Simple case of evolve --continue (with --[no-]update flag)
+Simple case of evolve --continue
 
   $ hg up ca1b80f7960a
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -53,7 +53,7 @@
   o  0:8fa14d15e168 added hgignore
       () draft
 
-  $ hg evolve --all --no-update
+  $ hg evolve --all
   move:[4] added d
   atop:[5] added c
   merging d
--- a/tests/test-evolve-issue5832.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-evolve-issue5832.t	Wed Apr 24 15:59:02 2019 +0200
@@ -125,14 +125,13 @@
   enter the index of the revision you want to select: 1
   move:[9] merge commit
   atop:[6] added c
-  working directory is now at 28a0775ac832
 
   $ hg glog
-  @    10:28a0775ac832 merge commit
+  o    10:28a0775ac832 merge commit
   |\    () draft
   | o  8:2baf8bae7ea4 added b
   | |   () draft
-  | | o  7:5841d7cf9893 added d
+  | | @  7:5841d7cf9893 added d
   | | |   () draft
   o---+  6:62fb70414f99 added c
    / /    () draft
@@ -266,14 +265,13 @@
   enter the index of the revision you want to select: 2
   move:[10] merge commit
   atop:[8] added d
-  working directory is now at 460e6e72b7f9
 
   $ hg glog
-  @    11:460e6e72b7f9 merge commit
+  o    11:460e6e72b7f9 merge commit
   |\    () draft
   | o  9:da76bb7cd904 added b
   | |   () draft
-  o |  8:5841d7cf9893 added d
+  @ |  8:5841d7cf9893 added d
   | |   () draft
   +---o  7:62fb70414f99 added c
   | |     () draft
@@ -414,14 +412,13 @@
   atop:[8] added d
   move:[10] merge commit
   atop:[9] added b
-  working directory is now at 578c938ebd2e
 
   $ hg glog
-  @    11:578c938ebd2e merge commit
+  o    11:578c938ebd2e merge commit
   |\    () draft
   | o  9:da76bb7cd904 added b
   | |   () draft
-  o |  8:5841d7cf9893 added d
+  @ |  8:5841d7cf9893 added d
   | |   () draft
   +---o  7:62fb70414f99 added c
   | |     () draft
--- a/tests/test-evolve-issue5881.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-evolve-issue5881.t	Wed Apr 24 15:59:02 2019 +0200
@@ -50,4 +50,4 @@
   working directory is now at e6048a693c0d
   move:[2] added c
   atop:[3] updated b
-  working directory is now at c3a628eb9aaf
+  working directory is now at e6048a693c0d
--- a/tests/test-evolve-issue5966.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-evolve-issue5966.t	Wed Apr 24 15:59:02 2019 +0200
@@ -91,7 +91,7 @@
   R a
   $ hg evolve --continue
   evolving 2:34a690fcf6ab "banana"
-  working directory is now at e4207a610ed0
+  working directory is now at 581a2bb4704c
   $ hg resolve --list
 
 evolve the rest of the stack
@@ -100,16 +100,15 @@
   move:[3] coconut
   atop:[5] banana
   merging a
-  working directory is now at d77b4639fe26
 
 All commit evolved
 
   $ hg glog
-  @  6: coconut
+  o  6: coconut
   |
   o  5: banana
   |
-  o  4: apricot
+  @  4: apricot
   |
   o  0: empty
   
--- a/tests/test-evolve-noupdate.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-evolve-noupdate.t	Wed Apr 24 15:59:02 2019 +0200
@@ -1,10 +1,10 @@
 Testing the `--no-update` flag to `hg evolve` command
 =====================================================
 
-There is an `--update` flag to `hg evolve` command which defaults to True. The
-`--update` flag updates to the head of the evolved revisions. If you dont want
+There is an `--update` flag to `hg evolve` command which defaults to False. The
+`--update` flag updates to the head of the evolved revisions. If you don't want
 to change your working directory or update your working directory to its
-sucessor after hg evolve, `hg evolve --no-update` is the thing for you.
+successor after hg evolve, `hg evolve --no-update` is the thing for you.
 
 This patch tests that flag.
 
@@ -37,7 +37,7 @@
   o  0:8fa14d15e168 added hgignore
       () draft
 
-Making sure we stay where we were is current wdir parent is not obsoleted
+Making sure we stay where we were if current wdir parent was not obsoleted
 --------------------------------------------------------------------------
 
   $ hg up .^^
@@ -59,7 +59,7 @@
   o  0:8fa14d15e168 added hgignore
       () draft
 
-There is 'working directory is now at' message because it didnt changed
+There is no 'working directory is now at' message because we didn't update
   $ hg evolve --all --no-update
   move:[3] added c
   atop:[5] added b
--- 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
-
--- a/tests/test-evolve-orphan-split.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-evolve-orphan-split.t	Wed Apr 24 15:59:02 2019 +0200
@@ -270,4 +270,3 @@
   enter the index of the revision you want to select: 1
   move:[7] added d
   atop:[8] added a b c
-  working directory is now at 71e4d45a7aaa
--- a/tests/test-evolve-phase-divergence.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-evolve-phase-divergence.t	Wed Apr 24 15:59:02 2019 +0200
@@ -931,14 +931,14 @@
   atop:[23] added g
   rebasing to destination parent: 21ae52e414e6
   no changes to commit
-  working directory is now at 428f7900a969
+  working directory is now at e3090241a10c
 
   $ hg glog -r f3794e5a91dc::
-  @  23:428f7900a969 added g
+  o  23:428f7900a969 added g
   |   () public
   o  22:21ae52e414e6 added f
   |   () public
-  o  21:e3090241a10c phase-divergent update to f3794e5a91dc:
+  @  21:e3090241a10c phase-divergent update to f3794e5a91dc:
   |   () public
   o  17:f3794e5a91dc added l to l
   |   () public
--- a/tests/test-evolve-phase.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-evolve-phase.t	Wed Apr 24 15:59:02 2019 +0200
@@ -36,11 +36,10 @@
   $ hg evolve
   move:[2] c
   atop:[3] b
-  working directory is now at 813dde83a7f3
   $ hg glog
-  @  4 - 813dde83a7f3 c (secret)
+  o  4 - 813dde83a7f3 c (secret)
   |
-  o  3 - fd89d0f19529 b (draft)
+  @  3 - fd89d0f19529 b (draft)
   |
   o  0 - cb9a9f314b8b a (draft)
   
@@ -116,12 +115,12 @@
   continue: hg evolve --continue
   $ hg evolve -c
   evolving 2:13833940840c "c"
-  working directory is now at 3d2080c198e5
+  working directory is now at 87495ea7c9ec
 
   $ hg glog
-  @  4 - 3d2080c198e5 c (secret)
+  o  4 - 3d2080c198e5 c (secret)
   |
-  o  3 - 87495ea7c9ec b (draft)
+  @  3 - 87495ea7c9ec b (draft)
   |
   o  0 - cb9a9f314b8b a (draft)
   
--- a/tests/test-evolve-public-content-divergent-main.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-evolve-public-content-divergent-main.t	Wed Apr 24 15:59:02 2019 +0200
@@ -506,7 +506,7 @@
 
   $ hg evolve --continue
   committed as 2a0f44767904
-  working directory is now at 2a0f44767904
+  working directory is now at 93cd84bbdaca
 
   $ hg evolve -l
   $ cd ..
@@ -634,7 +634,7 @@
 
   $ hg evolve --continue
   committed as b9082a9e66ce
-  working directory is now at b9082a9e66ce
+  working directory is now at 93cd84bbdaca
 
   $ hg evolve -l
   $ cd ..
--- a/tests/test-evolve-split.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-evolve-split.t	Wed Apr 24 15:59:02 2019 +0200
@@ -59,4 +59,3 @@
   $ hg evolve --rev "0::"
   move:[2] add uu
   atop:[4] _pp
-  working directory is now at 6f5bbe2e3df3
--- a/tests/test-evolve-stop-orphan.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-evolve-stop-orphan.t	Wed Apr 24 15:59:02 2019 +0200
@@ -293,13 +293,13 @@
   evolving 5:cb6a2ab625bb "added c"
   move:[6] added d
   atop:[10] added c
-  working directory is now at cd0909a30222
+  working directory is now at aec285328e90
   $ hg glog
-  @  11:cd0909a30222 added d
+  o  11:cd0909a30222 added d
   |   () draft
   o  10:cb1dd1086ef6 added c
   |   () draft
-  o  9:aec285328e90 added b
+  @  9:aec285328e90 added b
   |   () draft
   o  8:fd00db71edca added a
   |   () draft
@@ -310,8 +310,8 @@
 bookmarks of rest of them should stay where they are are
 -------------------------------------------------------------------------
 
-  $ hg up .^
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg up tip^
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bookmark b1
   $ hg up .^
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-evolve-topic.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-evolve-topic.t	Wed Apr 24 15:59:02 2019 +0200
@@ -393,9 +393,6 @@
   move:[s3] add hhh
   move:[s4] add iii
   move:[s5] add jjj
-  working directory is now at 38a82cbb794a
-  $ hg up 18
-  0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   $ echo "changes in hhh" > hhh
   $ hg add hhh
   $ hg ci --amend
@@ -440,4 +437,4 @@
   move:[s4] add iii
   atop:[s3] add hhh
   move:[s5] add jjj
-  working directory is now at 119e4c126fb2
+  working directory is now at 2c295936ac04
--- a/tests/test-evolve.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-evolve.t	Wed Apr 24 15:59:02 2019 +0200
@@ -368,7 +368,6 @@
   move:[3] another feature (child of 568a468b60fc)
   atop:[4] a nifty feature
   merging main-file-1
-  working directory is now at 99833d22b0c6
   $ hg log
   5	feature-B: another feature (child of ba0ec09b1bab) - test
   4	feature-A: a nifty feature - test
@@ -377,7 +376,7 @@
 Test commit -o options
 
   $ hg up -r "desc('a nifty feature')"
-  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg revert -r "desc('another feature')" --all
   reverting main-file-1
   adding file-from-B
@@ -467,13 +466,12 @@
   merging main-file-1
   move:[9] dansk 3!
   merging main-file-1
-  working directory is now at 96abb1319a47
   $ hg log -G
-  @  12	: dansk 3! - test
+  o  12	: dansk 3! - test
   |
   o  11	: dansk 2! - test
   |
-  o  10	feature-B: dansk! - test
+  @  10	feature-B: dansk! - test
   |
   o  5	: another feature (child of ba0ec09b1bab) - test
   |
@@ -838,6 +836,8 @@
 Test fold with commit messages
 
   $ cd ../work
+  $ hg up
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg fold --from .^ --message "Folding with custom commit message"
   2 changesets folded
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -907,12 +907,11 @@
   $ hg evolve
   move:[3] a3
   atop:[4] a2
-  working directory is now at 7c5649f73d11
 
   $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
-  @  5 [mybranch] a3
+  o  5 [mybranch] a3
   |
-  o  4 [mybranch] a2
+  @  4 [mybranch] a2
   |
   o  1 [default] a1
   |
@@ -928,25 +927,21 @@
   $ hg evolve
   move:[4] a2
   atop:[6] a1_
-  working directory is now at eb07e22a0e63
   $ hg evolve
   move:[5] a3
   atop:[7] a2
-  working directory is now at 777c26ca5e78
   $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
-  @  8 [mybranch] a3
+  o  8 [mybranch] a3
   |
   o  7 [mybranch] a2
   |
-  o  6 [default] a1_
+  @  6 [default] a1_
   |
   o  0 [default] a0
   
 
 Evolve from the middle of a stack pick the right changesets.
 
-  $ hg up -r "desc('a1_')"
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg ci --amend -m 'a1__'
   2 new orphan changesets
 
@@ -981,13 +976,12 @@
   move:[7] a2
   atop:[9] a1__
   (leaving bookmark testbookmark)
-  working directory is now at d952e93add6f
   $ ls .hg/bookmarks*
   .hg/bookmarks
   $ glog
-  @  10:d952e93add6f@mybranch(draft) a2
+  o  10:d952e93add6f@mybranch(draft) a2
   |
-  o  9:9f8b83c2e7f3@default(draft) a1__
+  @  9:9f8b83c2e7f3@default(draft) a1__
   |
   | *  8:777c26ca5e78@mybranch(draft) a3
   | |
@@ -1000,8 +994,6 @@
 
 Possibility to select what instability to solve first, asking for
 phase-divergent before content-divergent
-  $ hg up -r "desc('a1__')"
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg revert -r d952e93add6f --all
   reverting a
   $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
@@ -1064,11 +1056,10 @@
   $ hg evolve --any
   move:[8] a3
   atop:[12] phase-divergent update to d952e93add6f:
-  working directory is now at b88539ad24d7
   $ glog
-  @  13:b88539ad24d7@default(draft) a3
+  o  13:b88539ad24d7@default(draft) a3
   |
-  o  12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f:
+  @  12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f:
   |
   o  10:d952e93add6f@mybranch(public) a2
   |
@@ -1079,7 +1070,7 @@
 
 Check that we can resolve instabilities in a revset with more than one commit
   $ hg up b88539ad24d7 -C
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ mkcommit gg
   $ hg up b88539ad24d7
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -1137,13 +1128,12 @@
   atop:[16] a3
   move:[15] add gh
   atop:[16] a3
-  working directory is now at 0c049e4e5422
   $ glog
-  @  18:0c049e4e5422@default(draft) add gh
+  o  18:0c049e4e5422@default(draft) add gh
   |
   | o  17:98e171e2f272@default(draft) add gg
   |/
-  o  16:0cf3707e8971@default(draft) a3
+  @  16:0cf3707e8971@default(draft) a3
   |
   o  12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f:
   |
@@ -1183,7 +1173,7 @@
 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled
 
   $ hg --hidden up 14
-  2 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset 484fb3cfa7f2
   (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272)
   working directory parent is obsolete! (484fb3cfa7f2)
@@ -1287,15 +1277,14 @@
   move:[20] add j2
   atop:[23] add j1
   move:[21] add j3
-  working directory is now at 0d9203b74542
   $ glog -r "0cf3707e8971::"
-  @  25:0d9203b74542@default(draft) add j3
+  o  25:0d9203b74542@default(draft) add j3
   |
   o  24:f1b85956c48c@default(draft) add j2
   |
   o  23:0ef9ff75f8e2@default(draft) add j1
   |
-  | o  18:0c049e4e5422@default(draft) add gh
+  | @  18:0c049e4e5422@default(draft) add gh
   | |
   o |  17:98e171e2f272@default(draft) add gg
   |/
@@ -1303,7 +1292,7 @@
   |
   ~
   $ hg up 98e171e2f272
-  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
+  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkcommit c5_
   created new head
   $ hg prune '0ef9ff75f8e2 + f1b85956c48c'
@@ -1626,4 +1615,3 @@
   atop:[6] updated f
   move:[8] added e
   atop:[9] updated d
-  working directory is now at 7c67cee06242
--- a/tests/test-issue-5720.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-issue-5720.t	Wed Apr 24 15:59:02 2019 +0200
@@ -73,15 +73,15 @@
 Continue the evolution
   $ hg evolve --continue
   evolving 2:13833940840c "c"
-  working directory is now at 3d2080c198e5
+  working directory is now at 87495ea7c9ec
 
 Tip should stay in secret phase
   $ hg log -G -T "{rev}: {phase}"
-  @  4: secret
+  o  4: secret
   |
-  o  3: draft
+  @  3: draft
   |
   o  0: draft
   
-  $ hg log -r . -T '{phase}\n'
+  $ hg log -r tip -T '{phase}\n'
   secret
--- a/tests/test-split.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-split.t	Wed Apr 24 15:59:02 2019 +0200
@@ -1139,11 +1139,10 @@
   $ hg evolve -r 2
   move:[2] c
   atop:[3] split1
-  working directory is now at 21a63bd6ee88
   $ hg glog
-  @  5:21a63bd6ee88 c (draft)
+  o  5:21a63bd6ee88 c (draft)
   |
-  o  3:88437e073cd4 split1 (draft)
+  @  3:88437e073cd4 split1 (draft)
   |
   o  0:a5a1faba8d26 p (draft)
   
--- a/tests/test-stabilize-order.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-stabilize-order.t	Wed Apr 24 15:59:02 2019 +0200
@@ -72,11 +72,12 @@
   b
   committing manifest
   committing changelog
-  working directory is now at 81b8bbcd5892
+  resolving manifests
+  removing b
   $ glog
-  @  6:81b8bbcd5892@default(draft) addb
+  o  6:81b8bbcd5892@default(draft) addb
   |
-  o  5:005fe5914f78@default(draft) adda
+  @  5:005fe5914f78@default(draft) adda
   |
   | *  3:7a7552255fb5@default(draft) addc
   | |
@@ -89,8 +90,6 @@
 
 Test stabilizing a descendant predecessor's child
 
-  $ hg up -r 005fe5914f78
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg debugobsolete > successors.old
   $ hg evolve -v --update
   move:[3] addc
--- a/tests/test-topic-stack-complex.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-topic-stack-complex.t	Wed Apr 24 15:59:02 2019 +0200
@@ -142,9 +142,8 @@
   move:[s3] split2
   atop:[s2] split1
   move:[s4] Added e and f
-  working directory is now at ec94a1ed1330
   $ hg up s4
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id -r .
   ec94a1ed1330 tip
   $ hg up --hidden 'min(precursors(.))'
--- a/tests/test-tutorial.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-tutorial.t	Wed Apr 24 15:59:02 2019 +0200
@@ -1379,14 +1379,13 @@
   move:[13] animals
   atop:[12] bathroom stuff
   merging shopping
-  working directory is now at 2a2b36e14660
 
 The old version of bathroom is hidden again.
 
   $ hg log -G
-  @  2a2b36e14660 (draft): animals
+  o  2a2b36e14660 (draft): animals
   |
-  o  682004e81e71 (draft): bathroom stuff
+  @  682004e81e71 (draft): bathroom stuff
   |
   o  57e9caedbcb8 (public): SPAM SPAM
   |
@@ -1399,6 +1398,11 @@
   o  7e82d3f3c2cb (public): Monthy Python Shopping list
   
 
+And let's update to the newly evolved changeset.
+
+  $ hg update
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
 #if docgraph-ext
   $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
   .. graphviz::
--- a/tests/test-unstable-orphan.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-unstable-orphan.t	Wed Apr 24 15:59:02 2019 +0200
@@ -65,11 +65,10 @@
   $ hg evo --all --any --orphan
   move:[2] add _c
   atop:[3] bprime
-  working directory is now at fdcf3523a74d
   $ hg log -G
-  @  4:fdcf3523a74d@default(draft) add _c
+  o  4:fdcf3523a74d@default(draft) add _c
   |
-  o  3:36050226a9b9@default(draft) bprime
+  @  3:36050226a9b9@default(draft) bprime
   |
   o  0:135f39f4bd78@default(draft) add _a
   
@@ -117,11 +116,10 @@
   $ hg evo --all --any --orphan
   move:[2] add _c
   atop:[6] add bsecondsplit2
-  working directory is now at 98e3f21461ff
   $ hg log -G
-  @  7:98e3f21461ff@default(draft) add _c
+  o  7:98e3f21461ff@default(draft) add _c
   |
-  o  6:59b942dbda14@default(draft) add bsecondsplit2
+  @  6:59b942dbda14@default(draft) add bsecondsplit2
   |
   o  5:8ffdae67d696@default(draft) add bsecondsplit1
   |