equal
deleted
inserted
replaced
402 $ hg id -n |
402 $ hg id -n |
403 9 |
403 9 |
404 $ hg debugobsolete `getid 0` `getid 9` |
404 $ hg debugobsolete `getid 0` `getid 9` |
405 83b5778897ad try to obsolete immutable changeset 1f0dee641bb7 |
405 83b5778897ad try to obsolete immutable changeset 1f0dee641bb7 |
406 # at core level the warning is not issued |
406 # at core level the warning is not issued |
407 # this is now a big issue now that we have latecomer warning |
407 # this is now a big issue now that we have bumped warning |
408 $ qlog -r 'obsolete()' |
408 $ qlog -r 'obsolete()' |
409 3 |
409 3 |
410 - 0d3f46688ccc |
410 - 0d3f46688ccc |
411 allow to just kill changeset |
411 allow to just kill changeset |
412 |
412 |
530 adding manifests |
530 adding manifests |
531 adding file changes |
531 adding file changes |
532 added 1 changesets with 1 changes to 1 files (+1 heads) |
532 added 1 changesets with 1 changes to 1 files (+1 heads) |
533 $ cd .. |
533 $ cd .. |
534 |
534 |
535 check latecomer detection |
535 check bumped detection |
536 (make an obsolete changeset public) |
536 (make an obsolete changeset public) |
537 |
537 |
538 $ cd local |
538 $ cd local |
539 $ hg phase --public 11 |
539 $ hg phase --public 11 |
540 1 new latecomer changesets |
540 1 new bumped changesets |
541 $ hg log -G --template='{rev} - ({phase}) {node|short} {desc}\n' |
541 $ hg log -G --template='{rev} - ({phase}) {node|short} {desc}\n' |
542 @ 12 - (draft) 6db5e282cb91 add obsol_d''' |
542 @ 12 - (draft) 6db5e282cb91 add obsol_d''' |
543 | |
543 | |
544 | o 11 - (public) 9468a5f5d8b2 add obsol_d'' |
544 | o 11 - (public) 9468a5f5d8b2 add obsol_d'' |
545 |/ |
545 |/ |
549 | |
549 | |
550 o 1 - (public) 7c3bad9141dc add b |
550 o 1 - (public) 7c3bad9141dc add b |
551 | |
551 | |
552 o 0 - (public) 1f0dee641bb7 add a |
552 o 0 - (public) 1f0dee641bb7 add a |
553 |
553 |
554 $ hg log -r 'latecomer()' |
554 $ hg log -r 'bumped()' |
555 changeset: 12:6db5e282cb91 |
555 changeset: 12:6db5e282cb91 |
556 tag: tip |
556 tag: tip |
557 parent: 10:2033b4e49474 |
557 parent: 10:2033b4e49474 |
558 user: test |
558 user: test |
559 date: Thu Jan 01 00:00:00 1970 +0000 |
559 date: Thu Jan 01 00:00:00 1970 +0000 |
639 parent: 1[46]:50f11e5e3a63 tip (re) |
639 parent: 1[46]:50f11e5e3a63 tip (re) |
640 add obsolet_conflicting_d |
640 add obsolet_conflicting_d |
641 branch: default |
641 branch: default |
642 commit: (clean) |
642 commit: (clean) |
643 update: (9|11) new changesets, (9|10) branch heads \(merge\) (re) |
643 update: (9|11) new changesets, (9|10) branch heads \(merge\) (re) |
644 latecomer: 1 changesets |
644 bumped: 1 changesets |
645 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` |
645 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` |
646 $ hg log -r 'conflicting()' |
646 $ hg log -r 'conflicting()' |
647 changeset: 12:6db5e282cb91 |
647 changeset: 12:6db5e282cb91 |
648 parent: 10:2033b4e49474 |
648 parent: 10:2033b4e49474 |
649 user: test |
649 user: test |