[PATCH] test: ensure that 'hg update' is disabled while editing history with histedit (issue3655)

Jason Gauci jjg at fb.com
Mon Apr 11 19:08:58 UTC 2016


# HG changeset patch
# User Jason Gauci <jjg at fb.com>
# Date 1460401578 25200
#      Mon Apr 11 12:06:18 2016 -0700
# Node ID 1b7b8ced6798816e9f026b4249c39626cde09949
# Parent  c5565fc8848dd084d104ca40c33d1acdfcff8bc6
test: ensure that 'hg update' is disabled while editing history with histedit (issue3655)

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
@@ -77,6 +77,12 @@
   Editing (e860deea161a), you may commit or record as needed now.
   (hg histedit --continue to resume)

+try to update and get an error
+  $ hg update tip
+  abort: histedit in progress
+  (use 'hg histedit --continue' or 'hg histedit --abort')
+  [255]
+
 edit the plan via the editor
   $ cat >> $TESTTMP/editplan.sh <<EOF
   > cat > \$1 <<EOF2

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20160411/6367e44f/attachment.html>


More information about the Mercurial-devel mailing list