Patchwork test-histedit-edit.t: demonstrate qnew fails during a histedit (issue4366)

login
register
mail settings
Submitter Augie Fackler
Date March 13, 2015, 1:49 a.m.
Message ID <3b37b9c2b893d98cfcba.1426211386@106.17.16.172.in-addr.arpa>
Download mbox | patch
Permalink /patch/8039/
State Accepted
Commit 68d998a76994415dfb42c0e0d2cfc826d167f7f9
Headers show

Comments

Augie Fackler - March 13, 2015, 1:49 a.m.
# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1426211360 14400
#      Thu Mar 12 21:49:20 2015 -0400
# Node ID 3b37b9c2b893d98cfcba9896674e15721c038d64
# Parent  2b7ab29627fd93ca7f5cb838403c2f6c728469bd
test-histedit-edit.t: demonstrate qnew fails during a histedit (issue4366)

This was accidentally fixed by other work, but given that it's been
broken in the past, I'd like to have a test defending us against
regressions in this area, especially as we add more functionality to
histedit.
Matt Mackall - March 13, 2015, 5:39 p.m.
On Thu, 2015-03-12 at 21:49 -0400, Augie Fackler wrote:
> # HG changeset patch
> # User Augie Fackler <augie@google.com>
> # Date 1426211360 14400
> #      Thu Mar 12 21:49:20 2015 -0400
> # Node ID 3b37b9c2b893d98cfcba9896674e15721c038d64
> # Parent  2b7ab29627fd93ca7f5cb838403c2f6c728469bd
> test-histedit-edit.t: demonstrate qnew fails during a histedit (issue4366)

Queued for default, thanks.

Patch

diff --git a/tests/test-histedit-edit.t b/tests/test-histedit-edit.t
--- a/tests/test-histedit-edit.t
+++ b/tests/test-histedit-edit.t
@@ -95,6 +95,11 @@  commit, then edit the revision
   $ hg ci -m 'wat'
   created new head
   $ echo a > e
+qnew should fail while we're in the middle of the edit step
+  $ hg --config extensions.mq= qnew please-fail
+  abort: histedit in progress
+  (use 'hg histedit --continue' or 'hg histedit --abort')
+  [255]
   $ HGEDITOR='echo foobaz > ' hg histedit --continue 2>&1 | fixbundle
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved