Mercurial > hg

changeset 28890:468339891670

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: ensure that 'hg update' is disabled during histedit (issue3655)
author Jason Gauci <jjg@fb.com>
date Mon, 11 Apr 2016 12:06:18 -0700
parents 7a1e0711401e
children ac30adb260ea
files tests/test-histedit-edit.t
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-histedit-edit.t	Tue Apr 12 00:34:02 2016 -0400
+++ b/tests/test-histedit-edit.t	Mon Apr 11 12:06:18 2016 -0700
@@ -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