Mercurial > evolve

diff tests/test-fixup.t @ 6196:4a837da84f5f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixup: allow to be aborted using hg abort
author Anton Shestakov <av6@dwimlabs.net>
date Sun, 06 Mar 2022 17:44:11 +0300
parents 9e0aa8929206
children d18e16b9b793
line wrap: on
line diff
--- a/tests/test-fixup.t	Sun Mar 06 18:15:54 2022 +0300
+++ b/tests/test-fixup.t	Sun Mar 06 17:44:11 2022 +0300
@@ -188,6 +188,19 @@
    foo
   +update foo again
 
+testing abort command
+
+  $ 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')
+  [240]
+
+  $ hg abort
+  fixup aborted
+  working directory is now at 12b5e442244f
+
 testing --continue flag
 
   $ hg fixup -r 'desc("update foo")'