Mercurial > public > mercurial-scm > hg

diff tests/test-rebase-collapse.t @ 22206:6122ad50e38f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: use "rebase.collapse" as "editform" for "--collapse" always Before this patch, if both "--message" and "--collapse" are specified for "hg rebase", "rebaes.normal" is used as "editform" unexpectedly. Unlike patches before and after in this series for improvement, this is bug fix patch.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Fri, 15 Aug 2014 23:05:53 +0900
parents 18adc15635a1
children dfa44e25bb53
line wrap: on
line diff
--- a/tests/test-rebase-collapse.t	Fri Aug 15 23:05:53 2014 +0900
+++ b/tests/test-rebase-collapse.t	Fri Aug 15 23:05:53 2014 +0900
@@ -148,7 +148,12 @@
   abort: message can only be specified with collapse
   [255]
 
-  $ hg rebase --source 4 --collapse -m 'custom message'
+  $ cat > $TESTTMP/checkeditform.sh <<EOF
+  > env | grep HGEDITFORM
+  > true
+  > EOF
+  $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source 4 --collapse -m 'custom message' -e
+  HGEDITFORM=rebase.collapse
   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog