##// END OF EJS Templates
tests: remove third head in some of the 'rebase-parameters' tests...
Pierre-Yves David -
r28100:ab382192 default
parent child Browse files
Show More
@@ -46,11 +46,14 b''
46
46
47 $ cd ..
47 $ cd ..
48
48
49 Version with only two heads (to allow default destination to work)
50
51 $ hg clone -q -u . a a2heads -r 3 -r 8
49
52
50 These fail:
53 These fail:
51
54
52 $ hg clone -q -u . a a1
55 $ hg clone -q -u . a a0
53 $ cd a1
56 $ cd a0
54
57
55 $ hg rebase -s 8 -d 7
58 $ hg rebase -s 8 -d 7
56 nothing to rebase
59 nothing to rebase
@@ -117,6 +120,9 b' These work:'
117
120
118 Rebase with no arguments (from 3 onto 8):
121 Rebase with no arguments (from 3 onto 8):
119
122
123 $ cd ..
124 $ hg clone -q -u . a2heads a1
125 $ cd a1
120 $ hg up -q -C 3
126 $ hg up -q -C 3
121
127
122 $ hg rebase
128 $ hg rebase
@@ -126,22 +132,18 b' Rebase with no arguments (from 3 onto 8)'
126 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
132 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
127
133
128 $ hg tglog
134 $ hg tglog
129 @ 8: 'D'
135 @ 6: 'D'
130 |
131 o 7: 'C'
132 |
136 |
133 o 6: 'B'
137 o 5: 'C'
134 |
138 |
135 o 5: 'I'
139 o 4: 'B'
136 |
140 |
137 o 4: 'H'
141 o 3: 'I'
138 |
142 |
139 | o 3: 'G'
143 o 2: 'H'
140 |/|
144 |
141 o | 2: 'F'
145 o 1: 'F'
142 | |
146 |
143 | o 1: 'E'
144 |/
145 o 0: 'A'
147 o 0: 'A'
146
148
147 Try to rollback after a rebase (fail):
149 Try to rollback after a rebase (fail):
@@ -154,7 +156,7 b' Try to rollback after a rebase (fail):'
154
156
155 Rebase with base == '.' => same as no arguments (from 3 onto 8):
157 Rebase with base == '.' => same as no arguments (from 3 onto 8):
156
158
157 $ hg clone -q -u 3 a a2
159 $ hg clone -q -u 3 a2heads a2
158 $ cd a2
160 $ cd a2
159
161
160 $ hg rebase --base .
162 $ hg rebase --base .
@@ -164,22 +166,18 b" Rebase with base == '.' => same as no ar"
164 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
166 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
165
167
166 $ hg tglog
168 $ hg tglog
167 @ 8: 'D'
169 @ 6: 'D'
168 |
169 o 7: 'C'
170 |
170 |
171 o 6: 'B'
171 o 5: 'C'
172 |
172 |
173 o 5: 'I'
173 o 4: 'B'
174 |
174 |
175 o 4: 'H'
175 o 3: 'I'
176 |
176 |
177 | o 3: 'G'
177 o 2: 'H'
178 |/|
178 |
179 o | 2: 'F'
179 o 1: 'F'
180 | |
180 |
181 | o 1: 'E'
182 |/
183 o 0: 'A'
181 o 0: 'A'
184
182
185 $ cd ..
183 $ cd ..
@@ -220,7 +218,7 b' Rebase with dest == branch(.) => same as'
220
218
221 Specify only source (from 2 onto 8):
219 Specify only source (from 2 onto 8):
222
220
223 $ hg clone -q -u . a a4
221 $ hg clone -q -u . a2heads a4
224 $ cd a4
222 $ cd a4
225
223
226 $ hg rebase --source 'desc("C")'
224 $ hg rebase --source 'desc("C")'
@@ -229,20 +227,16 b' Specify only source (from 2 onto 8):'
229 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob)
227 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob)
230
228
231 $ hg tglog
229 $ hg tglog
232 o 8: 'D'
230 o 6: 'D'
233 |
231 |
234 o 7: 'C'
232 o 5: 'C'
235 |
236 @ 6: 'I'
237 |
233 |
238 o 5: 'H'
234 @ 4: 'I'
239 |
235 |
240 | o 4: 'G'
236 o 3: 'H'
241 |/|
237 |
242 o | 3: 'F'
238 o 2: 'F'
243 | |
239 |
244 | o 2: 'E'
245 |/
246 | o 1: 'B'
240 | o 1: 'B'
247 |/
241 |/
248 o 0: 'A'
242 o 0: 'A'
@@ -285,7 +279,7 b' Specify only dest (from 3 onto 6):'
285
279
286 Specify only base (from 1 onto 8):
280 Specify only base (from 1 onto 8):
287
281
288 $ hg clone -q -u . a a6
282 $ hg clone -q -u . a2heads a6
289 $ cd a6
283 $ cd a6
290
284
291 $ hg rebase --base 'desc("D")'
285 $ hg rebase --base 'desc("D")'
@@ -295,22 +289,18 b' Specify only base (from 1 onto 8):'
295 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
289 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
296
290
297 $ hg tglog
291 $ hg tglog
298 o 8: 'D'
292 o 6: 'D'
299 |
300 o 7: 'C'
301 |
293 |
302 o 6: 'B'
294 o 5: 'C'
303 |
295 |
304 @ 5: 'I'
296 o 4: 'B'
305 |
297 |
306 o 4: 'H'
298 @ 3: 'I'
307 |
299 |
308 | o 3: 'G'
300 o 2: 'H'
309 |/|
301 |
310 o | 2: 'F'
302 o 1: 'F'
311 | |
303 |
312 | o 1: 'E'
313 |/
314 o 0: 'A'
304 o 0: 'A'
315
305
316 $ cd ..
306 $ cd ..
@@ -383,7 +373,7 b' Specify base and dest (from 1 onto 7):'
383
373
384 Specify only revs (from 2 onto 8)
374 Specify only revs (from 2 onto 8)
385
375
386 $ hg clone -q -u . a a9
376 $ hg clone -q -u . a2heads a9
387 $ cd a9
377 $ cd a9
388
378
389 $ hg rebase --rev 'desc("C")::'
379 $ hg rebase --rev 'desc("C")::'
@@ -392,20 +382,16 b' Specify only revs (from 2 onto 8)'
392 saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob)
382 saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob)
393
383
394 $ hg tglog
384 $ hg tglog
395 o 8: 'D'
385 o 6: 'D'
396 |
386 |
397 o 7: 'C'
387 o 5: 'C'
398 |
399 @ 6: 'I'
400 |
388 |
401 o 5: 'H'
389 @ 4: 'I'
402 |
390 |
403 | o 4: 'G'
391 o 3: 'H'
404 |/|
392 |
405 o | 3: 'F'
393 o 2: 'F'
406 | |
394 |
407 | o 2: 'E'
408 |/
409 | o 1: 'B'
395 | o 1: 'B'
410 |/
396 |/
411 o 0: 'A'
397 o 0: 'A'
General Comments 0
You need to be logged in to leave comments. Login now