Mercurial > hg

diff tests/test-histedit-non-commute.t @ 41175:9bc7ec924234

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: fix --continue and --abort when curses is enabled I overlooked this when I did the initial import. Differential Revision: https://phab.mercurial-scm.org/D5540
author Augie Fackler <augie@google.com>
date Wed, 09 Jan 2019 18:00:20 -0500
parents e5ffc91a2276
children 15d2afa31e57
line wrap: on
line diff
--- a/tests/test-histedit-non-commute.t	Thu Jan 10 21:57:21 2019 +0900
+++ b/tests/test-histedit-non-commute.t	Wed Jan 09 18:00:20 2019 -0500
@@ -161,7 +161,10 @@
   warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   Fix up the change (pick 7b4e2f4b7bcd)
   (hg histedit --continue to resume)
-  $ hg histedit --continue 2>&1 | fixbundle
+We forcibly enable curses here so we can verify that continuing works
+with curses enabled.
+  $ hg histedit --continue --config ui.interactive=true \
+  >   --config ui.interface=curses 2>&1 | fixbundle
   abort: unresolved merge conflicts (see 'hg help resolve')
 
 This failure is caused by 7b4e2f4b7bcd "e" not rebasing the non commutative