equal
deleted
inserted
replaced
740 |
740 |
741 |
741 |
742 Unrelated marker does not alter the decision |
742 Unrelated marker does not alter the decision |
743 |
743 |
744 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
744 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
|
745 1 new obsolescence markers |
745 $ hg push http://localhost:$HGPORT2/ |
746 $ hg push http://localhost:$HGPORT2/ |
746 pushing to http://localhost:$HGPORT2/ |
747 pushing to http://localhost:$HGPORT2/ |
747 searching for changes |
748 searching for changes |
748 abort: push creates new remote head c922c0139ca0 with bookmark 'Y'! |
749 abort: push creates new remote head c922c0139ca0 with bookmark 'Y'! |
749 (merge or see 'hg help push' for details about pushing new heads) |
750 (merge or see 'hg help push' for details about pushing new heads) |
761 $ hg id --debug -r 4 |
762 $ hg id --debug -r 4 |
762 4efff6d98829d9c824c621afd6e3f01865f5439f |
763 4efff6d98829d9c824c621afd6e3f01865f5439f |
763 $ hg id --debug -r 5 |
764 $ hg id --debug -r 5 |
764 c922c0139ca03858f655e4a2af4dd02796a63969 tip Y |
765 c922c0139ca03858f655e4a2af4dd02796a63969 tip Y |
765 $ hg debugobsolete f6fc62dde3c0771e29704af56ba4d8af77abcc2f cccccccccccccccccccccccccccccccccccccccc |
766 $ hg debugobsolete f6fc62dde3c0771e29704af56ba4d8af77abcc2f cccccccccccccccccccccccccccccccccccccccc |
|
767 1 new obsolescence markers |
766 obsoleted 1 changesets |
768 obsoleted 1 changesets |
767 $ hg debugobsolete cccccccccccccccccccccccccccccccccccccccc 4efff6d98829d9c824c621afd6e3f01865f5439f |
769 $ hg debugobsolete cccccccccccccccccccccccccccccccccccccccc 4efff6d98829d9c824c621afd6e3f01865f5439f |
|
770 1 new obsolescence markers |
768 $ hg push http://localhost:$HGPORT2/ |
771 $ hg push http://localhost:$HGPORT2/ |
769 pushing to http://localhost:$HGPORT2/ |
772 pushing to http://localhost:$HGPORT2/ |
770 searching for changes |
773 searching for changes |
771 remote: adding changesets |
774 remote: adding changesets |
772 remote: adding manifests |
775 remote: adding manifests |