Mercurial > hg
comparison tests/test-rebase-parameters.t @ 28100:ab382192337a
tests: remove third head in some of the 'rebase-parameters' tests
These tests do not care about that extra branch at all. In future changeset we
will make rebase behave like merge and abort in case of an ambiguous destination
(eg: multiple other heads) and that extra branch will make the command
invocation breaks.
We preventively remove this extra branch from the relevant tests in an
independant changeset to reduce noise and increase confidence in the final
change.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Mon, 08 Feb 2016 14:02:53 +0100 |
parents | 07a5de79ec30 |
children | 79437fb352ce |
comparison
equal
deleted
inserted
replaced
28099:a5f0c0aab2bb | 28100:ab382192337a |
---|---|
44 |/ | 44 |/ |
45 o 0: 'A' | 45 o 0: 'A' |
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 |
57 [1] | 60 [1] |
58 | 61 |
115 | 118 |
116 These work: | 119 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 |
123 rebasing 1:42ccdea3bb16 "B" | 129 rebasing 1:42ccdea3bb16 "B" |
124 rebasing 2:5fddd98957c8 "C" | 130 rebasing 2:5fddd98957c8 "C" |
125 rebasing 3:32af7686d403 "D" | 131 rebasing 3:32af7686d403 "D" |
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) |
133 | |
134 $ hg tglog | |
135 @ 6: 'D' | |
136 | | |
137 o 5: 'C' | |
138 | | |
139 o 4: 'B' | |
140 | | |
141 o 3: 'I' | |
142 | | |
143 o 2: 'H' | |
144 | | |
145 o 1: 'F' | |
146 | | |
147 o 0: 'A' | |
148 | |
149 Try to rollback after a rebase (fail): | |
150 | |
151 $ hg rollback | |
152 no rollback information available | |
153 [1] | |
154 | |
155 $ cd .. | |
156 | |
157 Rebase with base == '.' => same as no arguments (from 3 onto 8): | |
158 | |
159 $ hg clone -q -u 3 a2heads a2 | |
160 $ cd a2 | |
161 | |
162 $ hg rebase --base . | |
163 rebasing 1:42ccdea3bb16 "B" | |
164 rebasing 2:5fddd98957c8 "C" | |
165 rebasing 3:32af7686d403 "D" | |
166 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob) | |
167 | |
168 $ hg tglog | |
169 @ 6: 'D' | |
170 | | |
171 o 5: 'C' | |
172 | | |
173 o 4: 'B' | |
174 | | |
175 o 3: 'I' | |
176 | | |
177 o 2: 'H' | |
178 | | |
179 o 1: 'F' | |
180 | | |
181 o 0: 'A' | |
182 | |
183 $ cd .. | |
184 | |
185 | |
186 Rebase with dest == branch(.) => same as no arguments (from 3 onto 8): | |
187 | |
188 $ hg clone -q -u 3 a a3 | |
189 $ cd a3 | |
190 | |
191 $ hg rebase --dest 'branch(.)' | |
192 rebasing 1:42ccdea3bb16 "B" | |
193 rebasing 2:5fddd98957c8 "C" | |
194 rebasing 3:32af7686d403 "D" | |
195 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob) | |
127 | 196 |
128 $ hg tglog | 197 $ hg tglog |
129 @ 8: 'D' | 198 @ 8: 'D' |
130 | | 199 | |
131 o 7: 'C' | 200 o 7: 'C' |
142 | | | 211 | | |
143 | o 1: 'E' | 212 | o 1: 'E' |
144 |/ | 213 |/ |
145 o 0: 'A' | 214 o 0: 'A' |
146 | 215 |
147 Try to rollback after a rebase (fail): | 216 $ cd .. |
148 | 217 |
149 $ hg rollback | 218 |
150 no rollback information available | 219 Specify only source (from 2 onto 8): |
151 [1] | 220 |
152 | 221 $ hg clone -q -u . a2heads a4 |
153 $ cd .. | 222 $ cd a4 |
154 | 223 |
155 Rebase with base == '.' => same as no arguments (from 3 onto 8): | 224 $ hg rebase --source 'desc("C")' |
156 | 225 rebasing 2:5fddd98957c8 "C" |
157 $ hg clone -q -u 3 a a2 | 226 rebasing 3:32af7686d403 "D" |
158 $ cd a2 | 227 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob) |
159 | 228 |
160 $ hg rebase --base . | 229 $ hg tglog |
230 o 6: 'D' | |
231 | | |
232 o 5: 'C' | |
233 | | |
234 @ 4: 'I' | |
235 | | |
236 o 3: 'H' | |
237 | | |
238 o 2: 'F' | |
239 | | |
240 | o 1: 'B' | |
241 |/ | |
242 o 0: 'A' | |
243 | |
244 $ cd .. | |
245 | |
246 | |
247 Specify only dest (from 3 onto 6): | |
248 | |
249 $ hg clone -q -u 3 a a5 | |
250 $ cd a5 | |
251 | |
252 $ hg rebase --dest 6 | |
161 rebasing 1:42ccdea3bb16 "B" | 253 rebasing 1:42ccdea3bb16 "B" |
162 rebasing 2:5fddd98957c8 "C" | 254 rebasing 2:5fddd98957c8 "C" |
163 rebasing 3:32af7686d403 "D" | 255 rebasing 3:32af7686d403 "D" |
164 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob) | 256 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob) |
165 | 257 |
166 $ hg tglog | 258 $ hg tglog |
167 @ 8: 'D' | 259 @ 8: 'D' |
168 | | 260 | |
169 o 7: 'C' | 261 o 7: 'C' |
170 | | 262 | |
171 o 6: 'B' | 263 o 6: 'B' |
172 | | 264 | |
173 o 5: 'I' | 265 | o 5: 'I' |
174 | | 266 | | |
267 | o 4: 'H' | |
268 | | | |
269 o | 3: 'G' | |
270 |\| | |
271 | o 2: 'F' | |
272 | | | |
273 o | 1: 'E' | |
274 |/ | |
275 o 0: 'A' | |
276 | |
277 $ cd .. | |
278 | |
279 | |
280 Specify only base (from 1 onto 8): | |
281 | |
282 $ hg clone -q -u . a2heads a6 | |
283 $ cd a6 | |
284 | |
285 $ hg rebase --base 'desc("D")' | |
286 rebasing 1:42ccdea3bb16 "B" | |
287 rebasing 2:5fddd98957c8 "C" | |
288 rebasing 3:32af7686d403 "D" | |
289 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob) | |
290 | |
291 $ hg tglog | |
292 o 6: 'D' | |
293 | | |
294 o 5: 'C' | |
295 | | |
296 o 4: 'B' | |
297 | | |
298 @ 3: 'I' | |
299 | | |
300 o 2: 'H' | |
301 | | |
302 o 1: 'F' | |
303 | | |
304 o 0: 'A' | |
305 | |
306 $ cd .. | |
307 | |
308 | |
309 Specify source and dest (from 2 onto 7): | |
310 | |
311 $ hg clone -q -u . a a7 | |
312 $ cd a7 | |
313 | |
314 $ hg rebase --source 2 --dest 7 | |
315 rebasing 2:5fddd98957c8 "C" | |
316 rebasing 3:32af7686d403 "D" | |
317 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob) | |
318 | |
319 $ hg tglog | |
320 o 8: 'D' | |
321 | | |
322 o 7: 'C' | |
323 | | |
324 | @ 6: 'I' | |
325 |/ | |
326 o 5: 'H' | |
327 | | |
328 | o 4: 'G' | |
329 |/| | |
330 o | 3: 'F' | |
331 | | | |
332 | o 2: 'E' | |
333 |/ | |
334 | o 1: 'B' | |
335 |/ | |
336 o 0: 'A' | |
337 | |
338 $ cd .. | |
339 | |
340 | |
341 Specify base and dest (from 1 onto 7): | |
342 | |
343 $ hg clone -q -u . a a8 | |
344 $ cd a8 | |
345 | |
346 $ hg rebase --base 3 --dest 7 | |
347 rebasing 1:42ccdea3bb16 "B" | |
348 rebasing 2:5fddd98957c8 "C" | |
349 rebasing 3:32af7686d403 "D" | |
350 saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob) | |
351 | |
352 $ hg tglog | |
353 o 8: 'D' | |
354 | | |
355 o 7: 'C' | |
356 | | |
357 o 6: 'B' | |
358 | | |
359 | @ 5: 'I' | |
360 |/ | |
175 o 4: 'H' | 361 o 4: 'H' |
176 | | 362 | |
177 | o 3: 'G' | 363 | o 3: 'G' |
178 |/| | 364 |/| |
179 o | 2: 'F' | 365 o | 2: 'F' |
183 o 0: 'A' | 369 o 0: 'A' |
184 | 370 |
185 $ cd .. | 371 $ cd .. |
186 | 372 |
187 | 373 |
188 Rebase with dest == branch(.) => same as no arguments (from 3 onto 8): | |
189 | |
190 $ hg clone -q -u 3 a a3 | |
191 $ cd a3 | |
192 | |
193 $ hg rebase --dest 'branch(.)' | |
194 rebasing 1:42ccdea3bb16 "B" | |
195 rebasing 2:5fddd98957c8 "C" | |
196 rebasing 3:32af7686d403 "D" | |
197 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob) | |
198 | |
199 $ hg tglog | |
200 @ 8: 'D' | |
201 | | |
202 o 7: 'C' | |
203 | | |
204 o 6: 'B' | |
205 | | |
206 o 5: 'I' | |
207 | | |
208 o 4: 'H' | |
209 | | |
210 | o 3: 'G' | |
211 |/| | |
212 o | 2: 'F' | |
213 | | | |
214 | o 1: 'E' | |
215 |/ | |
216 o 0: 'A' | |
217 | |
218 $ cd .. | |
219 | |
220 | |
221 Specify only source (from 2 onto 8): | |
222 | |
223 $ hg clone -q -u . a a4 | |
224 $ cd a4 | |
225 | |
226 $ hg rebase --source 'desc("C")' | |
227 rebasing 2:5fddd98957c8 "C" | |
228 rebasing 3:32af7686d403 "D" | |
229 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob) | |
230 | |
231 $ hg tglog | |
232 o 8: 'D' | |
233 | | |
234 o 7: 'C' | |
235 | | |
236 @ 6: 'I' | |
237 | | |
238 o 5: 'H' | |
239 | | |
240 | o 4: 'G' | |
241 |/| | |
242 o | 3: 'F' | |
243 | | | |
244 | o 2: 'E' | |
245 |/ | |
246 | o 1: 'B' | |
247 |/ | |
248 o 0: 'A' | |
249 | |
250 $ cd .. | |
251 | |
252 | |
253 Specify only dest (from 3 onto 6): | |
254 | |
255 $ hg clone -q -u 3 a a5 | |
256 $ cd a5 | |
257 | |
258 $ hg rebase --dest 6 | |
259 rebasing 1:42ccdea3bb16 "B" | |
260 rebasing 2:5fddd98957c8 "C" | |
261 rebasing 3:32af7686d403 "D" | |
262 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob) | |
263 | |
264 $ hg tglog | |
265 @ 8: 'D' | |
266 | | |
267 o 7: 'C' | |
268 | | |
269 o 6: 'B' | |
270 | | |
271 | o 5: 'I' | |
272 | | | |
273 | o 4: 'H' | |
274 | | | |
275 o | 3: 'G' | |
276 |\| | |
277 | o 2: 'F' | |
278 | | | |
279 o | 1: 'E' | |
280 |/ | |
281 o 0: 'A' | |
282 | |
283 $ cd .. | |
284 | |
285 | |
286 Specify only base (from 1 onto 8): | |
287 | |
288 $ hg clone -q -u . a a6 | |
289 $ cd a6 | |
290 | |
291 $ hg rebase --base 'desc("D")' | |
292 rebasing 1:42ccdea3bb16 "B" | |
293 rebasing 2:5fddd98957c8 "C" | |
294 rebasing 3:32af7686d403 "D" | |
295 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob) | |
296 | |
297 $ hg tglog | |
298 o 8: 'D' | |
299 | | |
300 o 7: 'C' | |
301 | | |
302 o 6: 'B' | |
303 | | |
304 @ 5: 'I' | |
305 | | |
306 o 4: 'H' | |
307 | | |
308 | o 3: 'G' | |
309 |/| | |
310 o | 2: 'F' | |
311 | | | |
312 | o 1: 'E' | |
313 |/ | |
314 o 0: 'A' | |
315 | |
316 $ cd .. | |
317 | |
318 | |
319 Specify source and dest (from 2 onto 7): | |
320 | |
321 $ hg clone -q -u . a a7 | |
322 $ cd a7 | |
323 | |
324 $ hg rebase --source 2 --dest 7 | |
325 rebasing 2:5fddd98957c8 "C" | |
326 rebasing 3:32af7686d403 "D" | |
327 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob) | |
328 | |
329 $ hg tglog | |
330 o 8: 'D' | |
331 | | |
332 o 7: 'C' | |
333 | | |
334 | @ 6: 'I' | |
335 |/ | |
336 o 5: 'H' | |
337 | | |
338 | o 4: 'G' | |
339 |/| | |
340 o | 3: 'F' | |
341 | | | |
342 | o 2: 'E' | |
343 |/ | |
344 | o 1: 'B' | |
345 |/ | |
346 o 0: 'A' | |
347 | |
348 $ cd .. | |
349 | |
350 | |
351 Specify base and dest (from 1 onto 7): | |
352 | |
353 $ hg clone -q -u . a a8 | |
354 $ cd a8 | |
355 | |
356 $ hg rebase --base 3 --dest 7 | |
357 rebasing 1:42ccdea3bb16 "B" | |
358 rebasing 2:5fddd98957c8 "C" | |
359 rebasing 3:32af7686d403 "D" | |
360 saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob) | |
361 | |
362 $ hg tglog | |
363 o 8: 'D' | |
364 | | |
365 o 7: 'C' | |
366 | | |
367 o 6: 'B' | |
368 | | |
369 | @ 5: 'I' | |
370 |/ | |
371 o 4: 'H' | |
372 | | |
373 | o 3: 'G' | |
374 |/| | |
375 o | 2: 'F' | |
376 | | | |
377 | o 1: 'E' | |
378 |/ | |
379 o 0: 'A' | |
380 | |
381 $ cd .. | |
382 | |
383 | |
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")::' |
390 rebasing 2:5fddd98957c8 "C" | 380 rebasing 2:5fddd98957c8 "C" |
391 rebasing 3:32af7686d403 "D" | 381 rebasing 3:32af7686d403 "D" |
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 | | 388 | |
399 @ 6: 'I' | 389 @ 4: 'I' |
400 | | 390 | |
401 o 5: 'H' | 391 o 3: 'H' |
402 | | 392 | |
403 | o 4: 'G' | 393 o 2: 'F' |
404 |/| | 394 | |
405 o | 3: 'F' | |
406 | | | |
407 | o 2: 'E' | |
408 |/ | |
409 | o 1: 'B' | 395 | o 1: 'B' |
410 |/ | 396 |/ |
411 o 0: 'A' | 397 o 0: 'A' |
412 | 398 |
413 $ cd .. | 399 $ cd .. |