Mercurial > hg

diff tests/test-histedit-fold.t @ 24828:5045a003260b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: fix rollup prompting for a commit message (issue4606) Commit 090da03361c5 broke histedit's rollup by causing it to open the editor. Turns out I missed a spot where the rollup option was read. This fixes that and adjusts the test to catch this case.
author Durham Goode <durham@fb.com>
date Mon, 20 Apr 2015 18:44:57 -0700
parents 3133e246c912
children ba8089433090
line wrap: on
line diff
--- a/tests/test-histedit-fold.t	Mon Apr 20 13:43:10 2015 -0400
+++ b/tests/test-histedit-fold.t	Mon Apr 20 18:44:57 2015 -0700
@@ -107,6 +107,8 @@
 
 rollup will fold without preserving the folded commit's message
 
+  $ OLDHGEDITOR=$HGEDITOR
+  $ HGEDITOR=false
   $ hg histedit d2ae7f538514 --commands - 2>&1 <<EOF | fixbundle
   > pick d2ae7f538514 b
   > roll ee283cb5f2d5 e
@@ -120,6 +122,8 @@
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
+  $ HGEDITOR=$OLDHGEDITOR
+
 log after edit
   $ hg logt --graph
   @  3:c4a9eb7989fc d