##// END OF EJS Templates
test: improve documentation of some histedit tests...
Pierre-Yves David -
r19015:07db88f0 default
parent child Browse files
Show More
@@ -1,3 +1,13 b''
1 Test histedit extention: Fold commands
2 ======================================
3
4 This test file is dedicated to testing the fold command in non conflicting
5 case.
6
7 Initialization
8 ---------------
9
10
1 11 $ . "$TESTDIR/histedit-helpers.sh"
2 12
3 13 $ cat >> $HGRCPATH <<EOF
@@ -8,13 +18,9 b''
8 18 > histedit=
9 19 > EOF
10 20
11 $ EDITED="$TESTTMP/editedhistory"
12 $ cat > $EDITED <<EOF
13 > pick e860deea161a e
14 > pick 652413bf663e f
15 > fold 177f92b77385 c
16 > pick 055a42cdd887 d
17 > EOF
21
22 Simple folding
23 --------------------
18 24 $ initrepo ()
19 25 > {
20 26 > hg init r
@@ -43,7 +49,13 b' log before edit'
43 49 o 0:cb9a9f314b8b a
44 50
45 51
46 edit the history
52 $ EDITED="$TESTTMP/editedhistory"
53 $ cat > $EDITED <<EOF
54 > pick e860deea161a e
55 > pick 652413bf663e f
56 > fold 177f92b77385 c
57 > pick 055a42cdd887 d
58 > EOF
47 59 $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle
48 60 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
49 61 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -100,6 +112,10 b' check histedit_source'
100 112 $ cd ..
101 113
102 114 folding and creating no new change doesn't break:
115 -------------------------------------------------
116
117 folded content is dropped during a merge.
118
103 119 $ mkdir fold-to-empty-test
104 120 $ cd fold-to-empty-test
105 121 $ hg init
@@ -159,6 +175,11 b' should effectively drop the changes from'
159 175
160 176 $ cd ..
161 177
178
179 Test fold through dropped
180 -------------------------
181
182
162 183 Test corner case where folded revision is separated from its parent by a
163 184 dropped revision.
164 185
General Comments 0
You need to be logged in to leave comments. Login now