equal
deleted
inserted
replaced
222 searching for changes |
222 searching for changes |
223 adding changesets |
223 adding changesets |
224 adding manifests |
224 adding manifests |
225 adding file changes |
225 adding file changes |
226 added 1 changesets with 1 changes to 1 files (+1 heads) |
226 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
227 pull obsolescence markers |
227 (run 'hg heads' to see heads, 'hg merge' to merge) |
228 (run 'hg heads' to see heads, 'hg merge' to merge) |
228 |
229 |
229 I now have a new heads. Note that this remote head is immutable |
230 I now have a new heads. Note that this remote head is immutable |
230 |
231 |
231 $ hg log -G |
232 $ hg log -G |
518 searching for changes |
519 searching for changes |
519 adding changesets |
520 adding changesets |
520 adding manifests |
521 adding manifests |
521 adding file changes |
522 adding file changes |
522 added 1 changesets with 1 changes to 1 files |
523 added 1 changesets with 1 changes to 1 files |
|
524 pull obsolescence markers |
523 (run 'hg update' to get a working copy) |
525 (run 'hg update' to get a working copy) |
524 $ hg log -G |
526 $ hg log -G |
525 o 75954b8cd933 (public): bathroom stuff |
527 o 75954b8cd933 (public): bathroom stuff |
526 | |
528 | |
527 o a224f2a4fb9f (public): SPAM SPAM |
529 o a224f2a4fb9f (public): SPAM SPAM |
574 searching for changes |
576 searching for changes |
575 adding changesets |
577 adding changesets |
576 adding manifests |
578 adding manifests |
577 adding file changes |
579 adding file changes |
578 added 1 changesets with 1 changes to 1 files |
580 added 1 changesets with 1 changes to 1 files |
|
581 pull obsolescence markers |
579 (run 'hg update' to get a working copy) |
582 (run 'hg update' to get a working copy) |
580 $ hg log -G |
583 $ hg log -G |
581 o 75954b8cd933 (draft): bathroom stuff |
584 o 75954b8cd933 (draft): bathroom stuff |
582 | |
585 | |
583 o a224f2a4fb9f (public): SPAM SPAM |
586 o a224f2a4fb9f (public): SPAM SPAM |
633 searching for changes |
636 searching for changes |
634 adding changesets |
637 adding changesets |
635 adding manifests |
638 adding manifests |
636 adding file changes |
639 adding file changes |
637 added 1 changesets with 1 changes to 1 files (+1 heads) |
640 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
641 pull obsolescence markers |
638 (run 'hg heads' to see heads, 'hg merge' to merge) |
642 (run 'hg heads' to see heads, 'hg merge' to merge) |
639 1 new unstable changesets |
643 1 new unstable changesets |
640 |
644 |
641 |
645 |
642 The new changeset "animal" is based on an old changeset of "bathroom". You can |
646 The new changeset "animal" is based on an old changeset of "bathroom". You can |
730 $ cd ../remote |
734 $ cd ../remote |
731 $ hg pull local # we up again to trigger the warning. it was displayed during the push |
735 $ hg pull local # we up again to trigger the warning. it was displayed during the push |
732 pulling from $TESTTMP/local |
736 pulling from $TESTTMP/local |
733 searching for changes |
737 searching for changes |
734 no changes found |
738 no changes found |
|
739 pull obsolescence markers |
735 working directory parent is obsolete! |
740 working directory parent is obsolete! |
736 |
741 |
737 now let's see where we are, and update to the successor |
742 now let's see where we are, and update to the successor |
738 |
743 |
739 $ hg parents |
744 $ hg parents |
759 searching for changes |
764 searching for changes |
760 adding changesets |
765 adding changesets |
761 adding manifests |
766 adding manifests |
762 adding file changes |
767 adding file changes |
763 added 1 changesets with 1 changes to 1 files |
768 added 1 changesets with 1 changes to 1 files |
|
769 pull obsolescence markers |
764 (run 'hg update' to get a working copy) |
770 (run 'hg update' to get a working copy) |
765 $ hg log -G |
771 $ hg log -G |
766 o 99f039c5ec9e (draft): SPAM SPAM SPAM |
772 o 99f039c5ec9e (draft): SPAM SPAM SPAM |
767 | |
773 | |
768 @ ee942144f952 (draft): animals |
774 @ ee942144f952 (draft): animals |