equal
deleted
inserted
replaced
50 |
50 |
51 $ hg rebase -s 3 -d 7 |
51 $ hg rebase -s 3 -d 7 |
52 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
52 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
53 |
53 |
54 $ hg tglog |
54 $ hg tglog |
55 @ 7: 'D' |
55 @ 7: 'D' |
56 |\ |
56 | |
57 | o 6: 'H' |
57 o 6: 'H' |
58 | | |
58 | |
59 | | o 5: 'G' |
59 | o 5: 'G' |
60 | |/| |
60 |/| |
61 | o | 4: 'F' |
61 o | 4: 'F' |
62 | | | |
62 | | |
63 | | o 3: 'E' |
63 | o 3: 'E' |
64 | |/ |
64 |/ |
65 o | 2: 'C' |
65 | o 2: 'C' |
66 | | |
66 | | |
67 o | 1: 'B' |
67 | o 1: 'B' |
68 |/ |
68 |/ |
69 o 0: 'A' |
69 o 0: 'A' |
70 |
70 |
71 $ cd .. |
71 $ cd .. |
72 |
72 |
78 |
78 |
79 $ hg rebase -s 3 -d 5 |
79 $ hg rebase -s 3 -d 5 |
80 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) |
80 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) |
81 |
81 |
82 $ hg tglog |
82 $ hg tglog |
83 @ 7: 'D' |
83 @ 7: 'D' |
84 |\ |
84 | |
85 | | o 6: 'H' |
85 | o 6: 'H' |
86 | |/ |
86 |/ |
87 | | o 5: 'G' |
87 | o 5: 'G' |
88 | |/| |
88 |/| |
89 | o | 4: 'F' |
89 o | 4: 'F' |
90 | | | |
90 | | |
91 | | o 3: 'E' |
91 | o 3: 'E' |
92 | |/ |
92 |/ |
93 o | 2: 'C' |
93 | o 2: 'C' |
94 | | |
94 | | |
95 o | 1: 'B' |
95 | o 1: 'B' |
96 |/ |
96 |/ |
97 o 0: 'A' |
97 o 0: 'A' |
98 |
98 |
99 $ cd .. |
99 $ cd .. |
100 |
100 |
301 $ hg rebase -s9 -d1 |
301 $ hg rebase -s9 -d1 |
302 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-backup.hg (glob) |
302 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-backup.hg (glob) |
303 $ hg log --template "{phase}\n" -r 9 |
303 $ hg log --template "{phase}\n" -r 9 |
304 secret |
304 secret |
305 Source phase lower than destination phase: new changeset get the phase of destination: |
305 Source phase lower than destination phase: new changeset get the phase of destination: |
306 $ hg rebase -s7 -d9 |
306 $ hg rebase -s8 -d9 |
307 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c9659aac0000-backup.hg (glob) |
307 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-backup.hg |
308 $ hg log --template "{phase}\n" -r 9 |
308 $ hg log --template "{phase}\n" -r 'rev(9)' |
309 secret |
309 secret |
310 |
310 |
311 $ cd .. |
311 $ cd .. |
312 |
312 |
313 Test for revset |
313 Test for revset |
402 | |
402 | |
403 o 11: 'H' |
403 o 11: 'H' |
404 | |
404 | |
405 o 10: 'G' |
405 o 10: 'G' |
406 | |
406 | |
407 o 9: 'D' |
407 o 9: 'D' |
408 |\ |
408 | |
409 | | o 8: 'I' |
409 | o 8: 'I' |
|
410 | | |
|
411 | o 7: 'H' |
|
412 | | |
|
413 | o 6: 'G' |
|
414 | | |
|
415 | | o 5: 'F' |
410 | | | |
416 | | | |
411 | | o 7: 'H' |
417 | | o 4: 'E' |
412 | | | |
|
413 | | o 6: 'G' |
|
414 | | | |
|
415 | | | o 5: 'F' |
|
416 | | | | |
|
417 | | | o 4: 'E' |
|
418 | | |/ |
|
419 | | o 3: 'D' |
|
420 | |/ |
418 | |/ |
|
419 | o 3: 'D' |
|
420 | | |
421 | o 2: 'C' |
421 | o 2: 'C' |
422 | | |
422 | | |
423 o | 1: 'B' |
423 o | 1: 'B' |
424 |/ |
424 |/ |
425 o 0: 'A' |
425 o 0: 'A' |
439 $ hg tglog |
439 $ hg tglog |
440 @ 11: 'H' |
440 @ 11: 'H' |
441 | |
441 | |
442 o 10: 'G' |
442 o 10: 'G' |
443 | |
443 | |
444 o 9: 'D' |
444 o 9: 'D' |
445 |\ |
445 | |
446 | | o 8: 'I' |
446 | o 8: 'I' |
|
447 | | |
|
448 | o 7: 'H' |
|
449 | | |
|
450 | o 6: 'G' |
|
451 | | |
|
452 | | o 5: 'F' |
447 | | | |
453 | | | |
448 | | o 7: 'H' |
454 | | o 4: 'E' |
449 | | | |
|
450 | | o 6: 'G' |
|
451 | | | |
|
452 | | | o 5: 'F' |
|
453 | | | | |
|
454 | | | o 4: 'E' |
|
455 | | |/ |
|
456 | | o 3: 'D' |
|
457 | |/ |
455 | |/ |
|
456 | o 3: 'D' |
|
457 | | |
458 | o 2: 'C' |
458 | o 2: 'C' |
459 | | |
459 | | |
460 o | 1: 'B' |
460 o | 1: 'B' |
461 |/ |
461 |/ |
462 o 0: 'A' |
462 o 0: 'A' |
480 | |
480 | |
481 | o 11: 'F' |
481 | o 11: 'F' |
482 | | |
482 | | |
483 | o 10: 'E' |
483 | o 10: 'E' |
484 |/ |
484 |/ |
485 o 9: 'D' |
485 o 9: 'D' |
486 |\ |
486 | |
487 | | o 8: 'I' |
487 | o 8: 'I' |
|
488 | | |
|
489 | o 7: 'H' |
|
490 | | |
|
491 | o 6: 'G' |
|
492 | | |
|
493 | | o 5: 'F' |
488 | | | |
494 | | | |
489 | | o 7: 'H' |
495 | | o 4: 'E' |
490 | | | |
|
491 | | o 6: 'G' |
|
492 | | | |
|
493 | | | o 5: 'F' |
|
494 | | | | |
|
495 | | | o 4: 'E' |
|
496 | | |/ |
|
497 | | o 3: 'D' |
|
498 | |/ |
496 | |/ |
|
497 | o 3: 'D' |
|
498 | | |
499 | o 2: 'C' |
499 | o 2: 'C' |
500 | | |
500 | | |
501 o | 1: 'B' |
501 o | 1: 'B' |
502 |/ |
502 |/ |
503 o 0: 'A' |
503 o 0: 'A' |