Mercurial > hg
diff tests/test-histedit-non-commute-abort.t @ 19019:53060cc1b601
histedit-test: generalise --commands "-" usage
This is simpler than temporary file version. There some minor test
changes since commit messages are no longer modifed. There is still
some tests using --commands with a real file.
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Tue, 16 Apr 2013 21:57:25 -0500 |
parents | 93f3a06b2035 |
children | aa9385f983fa |
line wrap: on
line diff
--- a/tests/test-histedit-non-commute-abort.t Tue Apr 16 20:48:37 2013 +0200 +++ b/tests/test-histedit-non-commute-abort.t Tue Apr 16 21:57:25 2013 -0500 @@ -6,14 +6,6 @@ > histedit= > EOF - $ EDITED="$TESTTMP/editedhistory" - $ cat > $EDITED <<EOF - > pick 177f92b77385 c - > pick 055a42cdd887 d - > pick bfa474341cc9 does not commute with e - > pick e860deea161a e - > pick 652413bf663e f - > EOF $ initrepo () > { > hg init r @@ -71,7 +63,13 @@ edit the history - $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle + $ hg histedit 177f92b77385 --commands - 2>&1 <<EOF | fixbundle + > pick 177f92b77385 c + > pick 055a42cdd887 d + > pick bfa474341cc9 does not commute with e + > pick e860deea161a e + > pick 652413bf663e f + > EOF 0 files updated, 0 files merged, 2 files removed, 0 files unresolved remote changed e which local deleted use (c)hanged version or leave (d)eleted? c