equal
deleted
inserted
replaced
454 o 1 public B |
454 o 1 public B |
455 | |
455 | |
456 o 0 public A |
456 o 0 public A |
457 |
457 |
458 |
458 |
459 move changeset forward and backward |
459 move changeset forward and backward and test kill switch |
460 |
460 |
|
461 $ cat <<EOF >> $HGRCPATH |
|
462 > [experimental] |
|
463 > nativephaseskillswitch = true |
|
464 > EOF |
461 $ hg phase --draft --force 1::4 |
465 $ hg phase --draft --force 1::4 |
462 $ hg log -G --template "{rev} {phase} {desc}\n" |
466 $ hg log -G --template "{rev} {phase} {desc}\n" |
463 @ 7 secret merge B' and E |
467 @ 7 secret merge B' and E |
464 |\ |
468 |\ |
465 | o 6 draft B' |
469 | o 6 draft B' |
476 | |
480 | |
477 o 0 public A |
481 o 0 public A |
478 |
482 |
479 test partial failure |
483 test partial failure |
480 |
484 |
|
485 $ cat <<EOF >> $HGRCPATH |
|
486 > [experimental] |
|
487 > nativephaseskillswitch = false |
|
488 > EOF |
481 $ hg phase --public 7 |
489 $ hg phase --public 7 |
482 $ hg phase --draft '5 or 7' |
490 $ hg phase --draft '5 or 7' |
483 cannot move 1 changesets to a higher phase, use --force |
491 cannot move 1 changesets to a higher phase, use --force |
484 phase changed for 1 changesets |
492 phase changed for 1 changesets |
485 [1] |
493 [1] |