Mercurial > hg-stable

changeset 24942:8174d27576a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 06 May 2015 16:56:28 -0500
parents 9c1942635c1f (current diff) 5bc506ee87d2 (diff)
children 3e39f67ef663
files
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-histedit-edit.t	Sun Apr 12 15:36:10 2015 -0400
+++ b/tests/test-histedit-edit.t	Wed May 06 16:56:28 2015 -0500
@@ -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