Mercurial > hg
changeset 19015:07db88f053fe
test: improve documentation of some histedit tests
Each test section is clearly separated from the others and gains some
helpful documentation.
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Tue, 16 Apr 2013 16:22:38 +0200 |
parents | 7b50120e8f6e |
children | 27ec54f2946e |
files | tests/test-histedit-fold.t |
diffstat | 1 files changed, 29 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-histedit-fold.t Tue Apr 16 23:24:52 2013 +0200 +++ b/tests/test-histedit-fold.t Tue Apr 16 16:22:38 2013 +0200 @@ -1,3 +1,13 @@ +Test histedit extention: Fold commands +====================================== + +This test file is dedicated to testing the fold command in non conflicting +case. + +Initialization +--------------- + + $ . "$TESTDIR/histedit-helpers.sh" $ cat >> $HGRCPATH <<EOF @@ -8,13 +18,9 @@ > histedit= > EOF - $ EDITED="$TESTTMP/editedhistory" - $ cat > $EDITED <<EOF - > pick e860deea161a e - > pick 652413bf663e f - > fold 177f92b77385 c - > pick 055a42cdd887 d - > EOF + +Simple folding +-------------------- $ initrepo () > { > hg init r @@ -43,7 +49,13 @@ o 0:cb9a9f314b8b a -edit the history + $ EDITED="$TESTTMP/editedhistory" + $ cat > $EDITED <<EOF + > pick e860deea161a e + > pick 652413bf663e f + > fold 177f92b77385 c + > pick 055a42cdd887 d + > EOF $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle 0 files updated, 0 files merged, 4 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -100,6 +112,10 @@ $ cd .. folding and creating no new change doesn't break: +------------------------------------------------- + +folded content is dropped during a merge. + $ mkdir fold-to-empty-test $ cd fold-to-empty-test $ hg init @@ -159,6 +175,11 @@ $ cd .. + +Test fold through dropped +------------------------- + + Test corner case where folded revision is separated from its parent by a dropped revision.