equal
deleted
inserted
replaced
485 $ echo r0 > foo; hg commit -qAm "r0" |
485 $ echo r0 > foo; hg commit -qAm "r0" |
486 $ echo alpha > foo; hg commit -qm "alpha" |
486 $ echo alpha > foo; hg commit -qm "alpha" |
487 $ echo beta >> foo |
487 $ echo beta >> foo |
488 $ cat > $TESTTMP/touchy_editor.sh <<EOF |
488 $ cat > $TESTTMP/touchy_editor.sh <<EOF |
489 > sleep 1 |
489 > sleep 1 |
490 > echo delta >> $TESTTMP/modify-during-amend/foo |
490 > echo delta >> "$TESTTMP/modify-during-amend/foo" |
491 > sleep 1 |
491 > sleep 1 |
492 > echo hi > "\$1" |
492 > echo hi > "\$1" |
493 > sleep 1 |
493 > sleep 1 |
494 > EOF |
494 > EOF |
495 $ HGEDITOR="sh $TESTTMP/touchy_editor.sh" hg commit --amend |
495 $ HGEDITOR="sh $TESTTMP/touchy_editor.sh" hg commit --amend |