equal
deleted
inserted
replaced
590 changeset: 12:6db5e282cb91 |
590 changeset: 12:6db5e282cb91 |
591 tag: tip |
591 tag: tip |
592 parent: 10:2033b4e49474 |
592 parent: 10:2033b4e49474 |
593 user: test |
593 user: test |
594 date: Thu Jan 01 00:00:00 1970 +0000 |
594 date: Thu Jan 01 00:00:00 1970 +0000 |
595 instability: bumped |
595 instability: phase-divergent |
596 summary: add obsol_d''' |
596 summary: add obsol_d''' |
597 |
597 |
598 $ hg push ../other-new/ |
598 $ hg push ../other-new/ |
599 pushing to ../other-new/ |
599 pushing to ../other-new/ |
600 searching for changes |
600 searching for changes |
601 abort: push includes bumped changeset: 6db5e282cb91! |
601 abort: push includes phase-divergent changeset: 6db5e282cb91! |
602 (use 'hg evolve' to get a stable history or --force to ignore warnings) |
602 (use 'hg evolve' to get a stable history or --force to ignore warnings) |
603 [255] |
603 [255] |
604 |
604 |
605 Check hg commit --amend compat |
605 Check hg commit --amend compat |
606 |
606 |
620 | |
620 | |
621 | o changeset: 12:6db5e282cb91 |
621 | o changeset: 12:6db5e282cb91 |
622 |/ parent: 10:2033b4e49474 |
622 |/ parent: 10:2033b4e49474 |
623 | user: test |
623 | user: test |
624 | date: Thu Jan 01 00:00:00 1970 +0000 |
624 | date: Thu Jan 01 00:00:00 1970 +0000 |
625 | instability: bumped |
625 | instability: phase-divergent |
626 | summary: add obsol_d''' |
626 | summary: add obsol_d''' |
627 | |
627 | |
628 | o changeset: 11:9468a5f5d8b2 |
628 | o changeset: 11:9468a5f5d8b2 |
629 |/ user: test |
629 |/ user: test |
630 | date: Thu Jan 01 00:00:00 1970 +0000 |
630 | date: Thu Jan 01 00:00:00 1970 +0000 |
677 add obsolet_conflicting_d |
677 add obsolet_conflicting_d |
678 branch: default |
678 branch: default |
679 commit: (clean) |
679 commit: (clean) |
680 update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re) |
680 update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re) |
681 phases: 3 draft |
681 phases: 3 draft |
682 bumped: 1 changesets |
682 phase-divergent: 1 changesets |
683 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` |
683 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` |
684 $ hg log -r 'divergent()' |
684 $ hg log -r 'divergent()' |
685 changeset: 12:6db5e282cb91 |
685 changeset: 12:6db5e282cb91 |
686 parent: 10:2033b4e49474 |
686 parent: 10:2033b4e49474 |
687 user: test |
687 user: test |
688 date: Thu Jan 01 00:00:00 1970 +0000 |
688 date: Thu Jan 01 00:00:00 1970 +0000 |
689 instability: bumped, content-divergent |
689 instability: phase-divergent, content-divergent |
690 summary: add obsol_d''' |
690 summary: add obsol_d''' |
691 |
691 |
692 changeset: 16:50f11e5e3a63 |
692 changeset: 16:50f11e5e3a63 |
693 tag: tip |
693 tag: tip |
694 parent: 11:9468a5f5d8b2 |
694 parent: 11:9468a5f5d8b2 |
765 | | | |
765 | | | |
766 | | | o changeset: 12:6db5e282cb91 |
766 | | | o changeset: 12:6db5e282cb91 |
767 | | |/ parent: 10:2033b4e49474 |
767 | | |/ parent: 10:2033b4e49474 |
768 | | | user: test |
768 | | | user: test |
769 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
769 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
770 | | | instability: bumped, content-divergent |
770 | | | instability: phase-divergent, content-divergent |
771 | | | summary: add obsol_d''' |
771 | | | summary: add obsol_d''' |
772 | | | |
772 | | | |
773 | o | changeset: 11:9468a5f5d8b2 |
773 | o | changeset: 11:9468a5f5d8b2 |
774 | |/ user: test |
774 | |/ user: test |
775 | | date: Thu Jan 01 00:00:00 1970 +0000 |
775 | | date: Thu Jan 01 00:00:00 1970 +0000 |