Mercurial > hg-stable

changeset 24933:5bc506ee87d2 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: fix test-histedit-edit on vfat test-histedit-edit was broken because it relied on the HGEDITOR script being executable. Instead, lets just execute 'sh' and pass it the script to run. This seems to be the pattern followed in other tests.
author Durham Goode <durham@fb.com>
date Tue, 05 May 2015 11:15:17 -0700
parents 41cd8171e58f
children 8174d27576a3 db7463aa080f
files tests/test-histedit-edit.t
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-histedit-edit.t	Mon May 04 22:33:29 2015 -0400
+++ b/tests/test-histedit-edit.t	Tue May 05 11:15:17 2015 -0700
@@ -71,15 +71,14 @@
   When you are finished, run hg histedit --continue to resume.
 
 edit the plan via the editor
-  $ cat >> ../editplan.sh <<EOF
+  $ cat >> $TESTTMP/editplan.sh <<EOF
   > cat > \$1 <<EOF2
   > drop e860deea161a e
   > drop 652413bf663e f
   > drop 3c6a8ed2ebe8 g
   > EOF2
   > EOF
-  $ chmod a+x ../editplan.sh
-  $ HGEDITOR=../editplan.sh hg histedit --edit-plan
+  $ HGEDITOR="sh $TESTTMP/editplan.sh" hg histedit --edit-plan
   $ cat .hg/histedit-state
   v1
   055a42cdd88768532f9cf79daa407fc8d138de9b