diff tests/test-evolve-continue.t @ 6395:1328195f76a9 mercurial-5.6

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

--- a/tests/test-evolve-continue.t	Thu Dec 08 20:23:47 2022 +0400
+++ b/tests/test-evolve-continue.t	Mon Feb 06 19:49:33 2023 +0400
@@ -41,7 +41,7 @@
 
 Simple case of evolve --continue
 
-  $ hg up ca1b80f7960a
+  $ hg up 'desc("added c")'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo bar > d
   $ hg add d
@@ -81,7 +81,7 @@
   evolving 4:c41c793e0ef1 "added d"
 
   $ hg glog
-  o  6:2a4e03d422e2 added d
+  o  6:250d8c3c5ad9 added d
   |   () draft
   @  5:cb6a2ab625bb added c
   |   () draft
@@ -95,28 +95,86 @@
   $ hg up
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
+Testing hg continue for evolve
+
+  $ hg up 'desc("added b")'
+  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
+  $ echo bar > c
+  $ hg add c
+  $ hg amend
+  2 new orphan changesets
+  $ hg glog
+  @  7:8591ebad2ee8 added b
+  |   () draft
+  | *  6:250d8c3c5ad9 added d
+  | |   () draft orphan
+  | *  5:cb6a2ab625bb added c
+  | |   () draft orphan
+  | x  2:b1661037fa25 added b
+  |/    () draft
+  o  1:c7586e2a9264 added a
+  |   () draft
+  o  0:8fa14d15e168 added hgignore
+      () draft
+
+  $ hg evolve --all
+  move:[5] added c
+  atop:[7] added b
+  merging c (inmemory !)
+  hit merge conflicts; retrying merge in working copy (inmemory !)
+  merging c
+  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
+  unresolved merge conflicts
+  (see 'hg help evolve.interrupted')
+  [1]
+
+  $ echo foo > c
+  $ hg resolve -m
+  (no more unresolved files)
+  continue: hg evolve --continue
+
+  $ hg continue
+  evolving 5:cb6a2ab625bb "added c"
+  move:[6] added d
+  atop:[8] added c
+
+  $ hg glog
+  o  9:628919fc6772 added d
+  |   () draft
+  o  8:f8d5006085c0 added c
+  |   () draft
+  @  7:8591ebad2ee8 added b
+  |   () draft
+  o  1:c7586e2a9264 added a
+  |   () draft
+  o  0:8fa14d15e168 added hgignore
+      () draft
+
+  $ hg up
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
 Case when conflicts resolution lead to empty wdir in evolve --continue
 
   $ echo foo > e
   $ hg ci -Aqm "added e"
   $ hg prev
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  [6] added d
+  [9] added d
   $ echo bar > e
   $ hg add e
   $ hg amend
   1 new orphan changesets
 
   $ hg glog
-  @  8:00a5c774cc37 added d
+  @  11:7898e026e390 added d
   |   () draft
-  | *  7:ad0a59d83efe added e
+  | *  10:5610cf0a9e66 added e
   | |   () draft orphan
-  | x  6:2a4e03d422e2 added d
+  | x  9:628919fc6772 added d
   |/    () draft
-  o  5:cb6a2ab625bb added c
+  o  8:f8d5006085c0 added c
   |   () draft
-  o  2:b1661037fa25 added b
+  o  7:8591ebad2ee8 added b
   |   () draft
   o  1:c7586e2a9264 added a
   |   () draft
@@ -124,8 +182,8 @@
       () draft
 
   $ hg evolve --update
-  move:[7] added e
-  atop:[8] added d
+  move:[10] added e
+  atop:[11] added d
   merging e (inmemory !)
   hit merge conflicts; retrying merge in working copy (inmemory !)
   merging e
@@ -141,15 +199,15 @@
   $ hg diff
 
   $ hg evolve --continue
-  evolving 7:ad0a59d83efe "added e"
-  evolution of 7:ad0a59d83efe created no changes to commit
+  evolving 10:5610cf0a9e66 "added e"
+  evolution of 10:5610cf0a9e66 created no changes to commit
 
   $ hg glog
-  @  8:00a5c774cc37 added d
+  @  11:7898e026e390 added d
   |   () draft
-  o  5:cb6a2ab625bb added c
+  o  8:f8d5006085c0 added c
   |   () draft
-  o  2:b1661037fa25 added b
+  o  7:8591ebad2ee8 added b
   |   () draft
   o  1:c7586e2a9264 added a
   |   () draft
@@ -158,7 +216,7 @@
 
 Case when there are a lot of revision to continue
 
-  $ hg up c7586e2a9264
+  $ hg up 'desc("added a")'
   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   $ echo bar > b
   $ hg add b
@@ -166,8 +224,8 @@
   3 new orphan changesets
 
   $ hg evolve --all --update
-  move:[2] added b
-  atop:[9] added a
+  move:[7] added b
+  atop:[12] added a
   merging b (inmemory !)
   hit merge conflicts; retrying merge in working copy (inmemory !)
   merging b
@@ -181,20 +239,20 @@
   (no more unresolved files)
   continue: hg evolve --continue
   $ hg evolve --continue
-  evolving 2:b1661037fa25 "added b"
-  move:[5] added c
-  atop:[10] added b
-  move:[8] added d
-  working directory is now at 6642d2c9176e
+  evolving 7:8591ebad2ee8 "added b"
+  move:[8] added c
+  atop:[13] added b
+  move:[11] added d
+  working directory is now at 0fb68c8390f6
 
   $ hg glog
-  @  12:6642d2c9176e added d
+  @  15:0fb68c8390f6 added d
   |   () draft
-  o  11:95665a2de664 added c
+  o  14:7bf9d72ff3bf added c
   |   () draft
-  o  10:87f748868183 added b
+  o  13:aaa724b65a25 added b
   |   () draft
-  o  9:53b632d203d8 added a
+  o  12:53b632d203d8 added a
   |   () draft
   o  0:8fa14d15e168 added hgignore
       () draft
@@ -205,24 +263,24 @@
   $ for ch in f g h; do echo foo > $ch; hg add $ch; hg ci -m "added "$ch; done;
 
   $ hg glog
-  @  15:09becba8f97d added h
+  @  18:1519cf722575 added h
   |   () draft
-  o  14:5aa7b2bbd944 added g
+  o  17:04c32ddd9b44 added g
   |   () draft
-  o  13:be88f889b6dc added f
+  o  16:29139ab665e3 added f
   |   () draft
-  o  12:6642d2c9176e added d
+  o  15:0fb68c8390f6 added d
   |   () draft
-  o  11:95665a2de664 added c
+  o  14:7bf9d72ff3bf added c
   |   () draft
-  o  10:87f748868183 added b
+  o  13:aaa724b65a25 added b
   |   () draft
-  o  9:53b632d203d8 added a
+  o  12:53b632d203d8 added a
   |   () draft
   o  0:8fa14d15e168 added hgignore
       () draft
 
-  $ hg up 95665a2de664
+  $ hg up 'desc("added c")'
   1 files updated, 0 files merged, 4 files removed, 0 files unresolved
 
   $ echo bar > f
@@ -232,29 +290,29 @@
   4 new orphan changesets
 
   $ hg glog
-  @  16:645135c5caa4 added c
+  @  19:ebc872a542e5 added c
   |   () draft
-  | *  15:09becba8f97d added h
+  | *  18:1519cf722575 added h
   | |   () draft orphan
-  | *  14:5aa7b2bbd944 added g
+  | *  17:04c32ddd9b44 added g
   | |   () draft orphan
-  | *  13:be88f889b6dc added f
+  | *  16:29139ab665e3 added f
   | |   () draft orphan
-  | *  12:6642d2c9176e added d
+  | *  15:0fb68c8390f6 added d
   | |   () draft orphan
-  | x  11:95665a2de664 added c
+  | x  14:7bf9d72ff3bf added c
   |/    () draft
-  o  10:87f748868183 added b
+  o  13:aaa724b65a25 added b
   |   () draft
-  o  9:53b632d203d8 added a
+  o  12:53b632d203d8 added a
   |   () draft
   o  0:8fa14d15e168 added hgignore
       () draft
 
   $ hg evolve --all --update
-  move:[12] added d
-  atop:[16] added c
-  move:[13] added f
+  move:[15] added d
+  atop:[19] added c
+  move:[16] added f
   merging f (inmemory !)
   hit merge conflicts; retrying merge in working copy (inmemory !)
   merging f
@@ -268,10 +326,10 @@
   (no more unresolved files)
   continue: hg evolve --continue
   $ hg evolve --continue
-  evolving 13:be88f889b6dc "added f"
-  move:[14] added g
-  atop:[18] added f
-  move:[15] added h
+  evolving 16:29139ab665e3 "added f"
+  move:[17] added g
+  atop:[21] added f
+  move:[18] added h
   merging h (inmemory !)
   hit merge conflicts; retrying merge in working copy (inmemory !)
   merging h
@@ -285,30 +343,30 @@
   (no more unresolved files)
   continue: hg evolve --continue
   $ hg evolve --continue
-  evolving 15:09becba8f97d "added h"
-  working directory is now at 3ba9d3d1b089
+  evolving 18:1519cf722575 "added h"
+  working directory is now at 0eb2b6434bd7
 
 Make sure, confirmopt is respected while continue
 
   $ hg glog
-  @  20:3ba9d3d1b089 added h
+  @  23:0eb2b6434bd7 added h
   |   () draft
-  o  19:981e615b14ca added g
+  o  22:d4c17c25a1c7 added g
   |   () draft
-  o  18:5794f1a3cbb2 added f
+  o  21:602e4bd1e5aa added f
   |   () draft
-  o  17:e47537da02b3 added d
+  o  20:5cf56d246d18 added d
   |   () draft
-  o  16:645135c5caa4 added c
+  o  19:ebc872a542e5 added c
   |   () draft
-  o  10:87f748868183 added b
+  o  13:aaa724b65a25 added b
   |   () draft
-  o  9:53b632d203d8 added a
+  o  12:53b632d203d8 added a
   |   () draft
   o  0:8fa14d15e168 added hgignore
       () draft
 
-  $ hg up 5794f1a3cbb2
+  $ hg up 'desc("added f")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo bar > g
   $ hg add g
@@ -318,8 +376,8 @@
   $ hg evolve --all --update --confirm << EOF
   > y
   > EOF
-  move:[19] added g
-  atop:[21] added f
+  move:[22] added g
+  atop:[24] added f
   perform evolve? [Ny] y
   merging g (inmemory !)
   hit merge conflicts; retrying merge in working copy (inmemory !)
@@ -337,26 +395,26 @@
   $ hg evolve --continue << EOF
   > y
   > EOF
-  evolving 19:981e615b14ca "added g"
-  move:[20] added h
-  atop:[22] added g
+  evolving 22:d4c17c25a1c7 "added g"
+  move:[23] added h
+  atop:[25] added g
   perform evolve? [Ny] y
-  working directory is now at af6bd002a48d
+  working directory is now at cc583f773dc4
 
   $ hg glog
-  @  23:af6bd002a48d added h
+  @  26:cc583f773dc4 added h
   |   () draft
-  o  22:d2c94a8f44bd added g
+  o  25:84772f0dfa79 added g
   |   () draft
-  o  21:9849fa96c885 added f
+  o  24:d074fc123610 added f
   |   () draft
-  o  17:e47537da02b3 added d
+  o  20:5cf56d246d18 added d
   |   () draft
-  o  16:645135c5caa4 added c
+  o  19:ebc872a542e5 added c
   |   () draft
-  o  10:87f748868183 added b
+  o  13:aaa724b65a25 added b
   |   () draft
-  o  9:53b632d203d8 added a
+  o  12:53b632d203d8 added a
   |   () draft
   o  0:8fa14d15e168 added hgignore
       () draft
@@ -370,8 +428,8 @@
   2 new orphan changesets
 
   $ hg next --evolve
-  move:[22] added g
-  atop:[24] added f
+  move:[25] added g
+  atop:[27] added f
   merging g (inmemory !)
   hit merge conflicts; retrying merge in working copy (inmemory !)
   merging g
@@ -384,7 +442,7 @@
   (no more unresolved files)
   continue: hg evolve --continue
   $ hg evolve --continue
-  evolving 22:d2c94a8f44bd "added g"
+  evolving 25:84772f0dfa79 "added g"
 
 Testing that interrupted evolve don't get confused about copies (issue5930):
 ----------------------------------------------------------------------------