equal
deleted
inserted
replaced
522 4:21679ff7675c foo3 |
522 4:21679ff7675c foo3 |
523 3:b7389cc4d66e foo2 |
523 3:b7389cc4d66e foo2 |
524 2:0e01aeef5fa8 foo1 |
524 2:0e01aeef5fa8 foo1 |
525 1:578c7455730c a |
525 1:578c7455730c a |
526 0:79b99e9c8e49 b |
526 0:79b99e9c8e49 b |
527 $ cat > $TESTTMP/editor.sh <<EOF |
527 $ cat > "$TESTTMP/editor.sh" <<EOF |
528 > echo ran editor >> $TESTTMP/editorlog.txt |
528 > echo ran editor >> "$TESTTMP/editorlog.txt" |
529 > cat \$1 >> $TESTTMP/editorlog.txt |
529 > cat \$1 >> "$TESTTMP/editorlog.txt" |
530 > echo END >> $TESTTMP/editorlog.txt |
530 > echo END >> "$TESTTMP/editorlog.txt" |
531 > echo merged foos > \$1 |
531 > echo merged foos > \$1 |
532 > EOF |
532 > EOF |
533 $ HGEDITOR="sh $TESTTMP/editor.sh" hg histedit 1 --commands - 2>&1 <<EOF | fixbundle |
533 $ HGEDITOR="sh \"$TESTTMP/editor.sh\"" hg histedit 1 --commands - 2>&1 <<EOF | fixbundle |
534 > pick 578c7455730c 1 a |
534 > pick 578c7455730c 1 a |
535 > pick 0e01aeef5fa8 2 foo1 |
535 > pick 0e01aeef5fa8 2 foo1 |
536 > fold b7389cc4d66e 3 foo2 |
536 > fold b7389cc4d66e 3 foo2 |
537 > fold 21679ff7675c 4 foo3 |
537 > fold 21679ff7675c 4 foo3 |
538 > EOF |
538 > EOF |