diff tests/test-fixup.t @ 6401:716912541759 mercurial-5.0

test-compat: merge mercurial-5.1 into mercurial-5.0

--- a/tests/test-fixup.t	Fri Dec 09 00:41:21 2022 +0400
+++ b/tests/test-fixup.t	Tue Feb 07 10:51:10 2023 +0400
@@ -10,6 +10,8 @@
   > evolve =
   > [diff]
   > git = 1
+  > [alias]
+  > continue = fixup --continue
   > EOF
 
   $ hg help fixup
@@ -258,6 +260,43 @@
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   working directory is now at fed7e534b3bb
 
+testing continue command
+
+  $ hg up -r 'desc("baz")'
+  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ echo 'not foo' > foo
+
+  $ hg fixup -r 'desc("update foo")'
+  merging foo
+  warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
+  unresolved merge conflicts
+  (see 'hg help evolve.interrupted')
+  [1]
+  $ echo 'bonjour fixed' > foo
+  $ hg resolve --mark foo
+  (no more unresolved files)
+  continue: hg fixup --continue
+
+  $ hg continue
+  evolving 14:6b0b1270d7dd "temporary fixup commit"
+
+  $ hg glog
+  o  16:0dd54868f420 update foo
+  |   () draft
+  | @  14:6b0b1270d7dd temporary fixup commit
+  | |   () secret
+  | o  9:12b5e442244f baz
+  | |   () secret
+  | o  5:2eec5320cfc7 bar
+  |/    (bm) draft
+  o  0:e63c23eaa88a foo
+      () draft
+
+  $ hg evolve
+  update:[16] update foo
+  1 files updated, 0 files merged, 2 files removed, 0 files unresolved
+  working directory is now at 0dd54868f420
+
 amending a descendant of wdp
 
   $ hg up 0
@@ -266,11 +305,11 @@
   $ hg add foobar
   $ hg fixup -r 'desc(baz)'
   $ hg glog
-  o  16:b50fd0850076 baz
+  o  19:b50fd0850076 baz
   |   () secret
-  | @  14:4a9c4d14d447 temporary fixup commit
+  | @  17:4a9c4d14d447 temporary fixup commit
   | |   () draft
-  | | o  13:fed7e534b3bb update foo
+  | | o  16:0dd54868f420 update foo
   | |/    () draft
   o |  5:2eec5320cfc7 bar
   |/    (bm) draft
@@ -278,14 +317,14 @@
       () draft
 
   $ hg evolve
-  update:[16] baz
+  update:[19] baz
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at b50fd0850076
 
   $ hg glog
-  @  16:b50fd0850076 baz
+  @  19:b50fd0850076 baz
   |   () secret
-  | o  13:fed7e534b3bb update foo
+  | o  16:0dd54868f420 update foo
   | |   () draft
   o |  5:2eec5320cfc7 bar
   |/    (bm) draft