Mercurial > hg

comparison tests/test-histedit-non-commute.t @ 17085:35729bdd59b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: convert histedit tests to .t Mostly a trivial conversion.
author Mads Kiilerich <mads@kiilerich.com>
date Sat, 30 Jun 2012 03:34:44 +0200
parents tests/test-histedit-non-commute@168cc52ad7c2
children 5f2cacb715dc
comparison
equal deleted inserted replaced
17084:69dae7982c85 17085:35729bdd59b6
1 $ . "$TESTDIR/histedit-helpers.sh"
2
3 $ cat >> $HGRCPATH <<EOF
4 > [extensions]
5 > graphlog=
6 > histedit=
7 > EOF
8
9 $ EDITED=`pwd`/editedhistory
10 $ cat > $EDITED <<EOF
11 > pick 177f92b77385 c
12 > pick 055a42cdd887 d
13 > pick bfa474341cc9 does not commute with e
14 > pick e860deea161a e
15 > pick 652413bf663e f
16 > EOF
17 $ initrepo ()
18 > {
19 > hg init $1
20 > cd $1
21 > for x in a b c d e f ; do
22 > echo $x > $x
23 > hg add $x
24 > hg ci -m $x
25 > done
26 > echo a >> e
27 > hg ci -m 'does not commute with e'
28 > cd ..
29 > }
30
31 $ initrepo r1
32 $ cd r1
33
34 log before edit
35 $ hg log --graph
36 @ changeset: 6:bfa474341cc9
37 | tag: tip
38 | user: test
39 | date: Thu Jan 01 00:00:00 1970 +0000
40 | summary: does not commute with e
41 |
42 o changeset: 5:652413bf663e
43 | user: test
44 | date: Thu Jan 01 00:00:00 1970 +0000
45 | summary: f
46 |
47 o changeset: 4:e860deea161a
48 | user: test
49 | date: Thu Jan 01 00:00:00 1970 +0000
50 | summary: e
51 |
52 o changeset: 3:055a42cdd887
53 | user: test
54 | date: Thu Jan 01 00:00:00 1970 +0000
55 | summary: d
56 |
57 o changeset: 2:177f92b77385
58 | user: test
59 | date: Thu Jan 01 00:00:00 1970 +0000
60 | summary: c
61 |
62 o changeset: 1:d2ae7f538514
63 | user: test
64 | date: Thu Jan 01 00:00:00 1970 +0000
65 | summary: b
66 |
67 o changeset: 0:cb9a9f314b8b
68 user: test
69 date: Thu Jan 01 00:00:00 1970 +0000
70 summary: a
71
72
73 edit the history
74 $ HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle
75 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
76 1 out of 1 hunks FAILED -- saving rejects to file e.rej
77 abort: Fix up the change and run hg histedit --continue
78
79 abort the edit
80 $ hg histedit --abort 2>&1 | fixbundle
81 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
82
83
84 second edit set
85
86 $ hg log --graph
87 @ changeset: 6:bfa474341cc9
88 | tag: tip
89 | user: test
90 | date: Thu Jan 01 00:00:00 1970 +0000
91 | summary: does not commute with e
92 |
93 o changeset: 5:652413bf663e
94 | user: test
95 | date: Thu Jan 01 00:00:00 1970 +0000
96 | summary: f
97 |
98 o changeset: 4:e860deea161a
99 | user: test
100 | date: Thu Jan 01 00:00:00 1970 +0000
101 | summary: e
102 |
103 o changeset: 3:055a42cdd887
104 | user: test
105 | date: Thu Jan 01 00:00:00 1970 +0000
106 | summary: d
107 |
108 o changeset: 2:177f92b77385
109 | user: test
110 | date: Thu Jan 01 00:00:00 1970 +0000
111 | summary: c
112 |
113 o changeset: 1:d2ae7f538514
114 | user: test
115 | date: Thu Jan 01 00:00:00 1970 +0000
116 | summary: b
117 |
118 o changeset: 0:cb9a9f314b8b
119 user: test
120 date: Thu Jan 01 00:00:00 1970 +0000
121 summary: a
122
123
124 edit the history
125 $ HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle
126 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
127 1 out of 1 hunks FAILED -- saving rejects to file e.rej
128 abort: Fix up the change and run hg histedit --continue
129
130 fix up
131 $ echo a > e
132 $ hg add e
133 $ hg histedit --continue 2>&1 | fixbundle
134 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
135 file e already exists
136 1 out of 1 hunks FAILED -- saving rejects to file e.rej
137 abort: Fix up the change and run hg histedit --continue
138
139 just continue this time
140 $ hg histedit --continue 2>&1 | fixbundle
141 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
142 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
143
144 log after edit
145 $ hg log --graph
146 @ changeset: 5:9ab84894b459
147 | tag: tip
148 | user: test
149 | date: Thu Jan 01 00:00:00 1970 +0000
150 | summary: f
151 |
152 o changeset: 4:1fff3ae8199d
153 | user: test
154 | date: Thu Jan 01 00:00:00 1970 +0000
155 | summary: does not commute with e
156 |
157 o changeset: 3:055a42cdd887
158 | user: test
159 | date: Thu Jan 01 00:00:00 1970 +0000
160 | summary: d
161 |
162 o changeset: 2:177f92b77385
163 | user: test
164 | date: Thu Jan 01 00:00:00 1970 +0000
165 | summary: c
166 |
167 o changeset: 1:d2ae7f538514
168 | user: test
169 | date: Thu Jan 01 00:00:00 1970 +0000
170 | summary: b
171 |
172 o changeset: 0:cb9a9f314b8b
173 user: test
174 date: Thu Jan 01 00:00:00 1970 +0000
175 summary: a
176
177
178 start over
179
180 $ cd ..
181
182 $ initrepo r2
183 $ cd r2
184 $ cat > $EDITED <<EOF
185 > pick 177f92b77385 c
186 > pick 055a42cdd887 d
187 > mess bfa474341cc9 does not commute with e
188 > pick e860deea161a e
189 > pick 652413bf663e f
190 > EOF
191
192 edit the history, this time with a fold action
193 $ HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle
194 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
195 1 out of 1 hunks FAILED -- saving rejects to file e.rej
196 abort: Fix up the change and run hg histedit --continue
197
198 $ echo a > e
199 $ hg add e
200 $ HGEDITOR="cat $EDITED > " hg histedit --continue 2>&1 | fixbundle
201 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
202 file e already exists
203 1 out of 1 hunks FAILED -- saving rejects to file e.rej
204 abort: Fix up the change and run hg histedit --continue
205 second edit also fails, but just continue
206 $ hg histedit --continue 2>&1 | fixbundle
207 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
208 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
209
210 post message fix
211 $ hg log --graph
212 @ changeset: 5:6459970fb49b
213 | tag: tip
214 | user: test
215 | date: Thu Jan 01 00:00:00 1970 +0000
216 | summary: f
217 |
218 o changeset: 4:556f27c874b0
219 | user: test
220 | date: Thu Jan 01 00:00:00 1970 +0000
221 | summary: pick 177f92b77385 c
222 |
223 o changeset: 3:055a42cdd887
224 | user: test
225 | date: Thu Jan 01 00:00:00 1970 +0000
226 | summary: d
227 |
228 o changeset: 2:177f92b77385
229 | user: test
230 | date: Thu Jan 01 00:00:00 1970 +0000
231 | summary: c
232 |
233 o changeset: 1:d2ae7f538514
234 | user: test
235 | date: Thu Jan 01 00:00:00 1970 +0000
236 | summary: b
237 |
238 o changeset: 0:cb9a9f314b8b
239 user: test
240 date: Thu Jan 01 00:00:00 1970 +0000
241 summary: a
242
243
244 $ cd ..