##// END OF EJS Templates
merge with stable
Matt Mackall -
r24942:8174d275 merge default
parent child Browse files
Show More
@@ -71,15 +71,14 b' edit the history'
71 When you are finished, run hg histedit --continue to resume.
71 When you are finished, run hg histedit --continue to resume.
72
72
73 edit the plan via the editor
73 edit the plan via the editor
74 $ cat >> ../editplan.sh <<EOF
74 $ cat >> $TESTTMP/editplan.sh <<EOF
75 > cat > \$1 <<EOF2
75 > cat > \$1 <<EOF2
76 > drop e860deea161a e
76 > drop e860deea161a e
77 > drop 652413bf663e f
77 > drop 652413bf663e f
78 > drop 3c6a8ed2ebe8 g
78 > drop 3c6a8ed2ebe8 g
79 > EOF2
79 > EOF2
80 > EOF
80 > EOF
81 $ chmod a+x ../editplan.sh
81 $ HGEDITOR="sh $TESTTMP/editplan.sh" hg histedit --edit-plan
82 $ HGEDITOR=../editplan.sh hg histedit --edit-plan
83 $ cat .hg/histedit-state
82 $ cat .hg/histedit-state
84 v1
83 v1
85 055a42cdd88768532f9cf79daa407fc8d138de9b
84 055a42cdd88768532f9cf79daa407fc8d138de9b
General Comments 0
You need to be logged in to leave comments. Login now