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 |
|
228 (run 'hg heads' to see heads, 'hg merge' to merge) |
227 (run 'hg heads' to see heads, 'hg merge' to merge) |
229 |
228 |
230 I now have a new heads. Note that this remote head is immutable |
229 I now have a new heads. Note that this remote head is immutable |
231 |
230 |
232 $ hg log -G |
231 $ hg log -G |
404 searching for changes |
403 searching for changes |
405 adding changesets |
404 adding changesets |
406 adding manifests |
405 adding manifests |
407 adding file changes |
406 adding file changes |
408 added 3 changesets with 3 changes to 1 files |
407 added 3 changesets with 3 changes to 1 files |
409 pushing 6 obsolescence markers (* bytes) (glob) |
408 6 new obsolescence markers |
410 6 obsolescence markers added |
|
411 |
409 |
412 for simplicity sake we get the bathroom change in line again |
410 for simplicity sake we get the bathroom change in line again |
413 |
411 |
414 $ hg grab 10b8aeaa8cc8 |
412 $ hg grab 10b8aeaa8cc8 |
415 rebasing 9:10b8aeaa8cc8 "bathroom stuff" |
413 rebasing 9:10b8aeaa8cc8 "bathroom stuff" |
526 searching for changes |
524 searching for changes |
527 adding changesets |
525 adding changesets |
528 adding manifests |
526 adding manifests |
529 adding file changes |
527 adding file changes |
530 added 1 changesets with 1 changes to 1 files |
528 added 1 changesets with 1 changes to 1 files |
531 pull obsolescence markers |
529 1 new obsolescence markers |
532 1 obsolescence markers added |
|
533 (run 'hg update' to get a working copy) |
530 (run 'hg update' to get a working copy) |
534 $ hg log -G |
531 $ hg log -G |
535 o 75954b8cd933 (public): bathroom stuff |
532 o 75954b8cd933 (public): bathroom stuff |
536 | |
533 | |
537 o a224f2a4fb9f (public): SPAM SPAM |
534 o a224f2a4fb9f (public): SPAM SPAM |
584 searching for changes |
581 searching for changes |
585 adding changesets |
582 adding changesets |
586 adding manifests |
583 adding manifests |
587 adding file changes |
584 adding file changes |
588 added 1 changesets with 1 changes to 1 files |
585 added 1 changesets with 1 changes to 1 files |
589 pull obsolescence markers |
586 1 new obsolescence markers |
590 1 obsolescence markers added |
|
591 (run 'hg update' to get a working copy) |
587 (run 'hg update' to get a working copy) |
592 $ hg log -G |
588 $ hg log -G |
593 o 75954b8cd933 (draft): bathroom stuff |
589 o 75954b8cd933 (draft): bathroom stuff |
594 | |
590 | |
595 o a224f2a4fb9f (public): SPAM SPAM |
591 o a224f2a4fb9f (public): SPAM SPAM |
645 searching for changes |
641 searching for changes |
646 adding changesets |
642 adding changesets |
647 adding manifests |
643 adding manifests |
648 adding file changes |
644 adding file changes |
649 added 1 changesets with 1 changes to 1 files (+1 heads) |
645 added 1 changesets with 1 changes to 1 files (+1 heads) |
650 pull obsolescence markers |
|
651 0 obsolescence markers added |
|
652 (run 'hg heads' to see heads, 'hg merge' to merge) |
646 (run 'hg heads' to see heads, 'hg merge' to merge) |
653 1 new unstable changesets |
647 1 new unstable changesets |
654 |
648 |
655 |
649 |
656 The new changeset "animal" is based on an old changeset of "bathroom". You can |
650 The new changeset "animal" is based on an old changeset of "bathroom". You can |
736 searching for changes |
730 searching for changes |
737 adding changesets |
731 adding changesets |
738 adding manifests |
732 adding manifests |
739 adding file changes |
733 adding file changes |
740 added 2 changesets with 2 changes to 1 files (+1 heads) |
734 added 2 changesets with 2 changes to 1 files (+1 heads) |
741 pushing 10 obsolescence markers (* bytes) (glob) |
735 3 new obsolescence markers |
742 3 obsolescence markers added |
|
743 |
736 |
744 remote get a warning that current working directory is based on an obsolete changeset |
737 remote get a warning that current working directory is based on an obsolete changeset |
745 |
738 |
746 $ cd ../remote |
739 $ cd ../remote |
747 $ hg pull local # we up again to trigger the warning. it was displayed during the push |
740 $ hg pull local # we up again to trigger the warning. it was displayed during the push |
748 pulling from $TESTTMP/local (glob) |
741 pulling from $TESTTMP/local (glob) |
749 searching for changes |
742 searching for changes |
750 no changes found |
743 no changes found |
751 pull obsolescence markers |
|
752 0 obsolescence markers added |
|
753 working directory parent is obsolete! |
744 working directory parent is obsolete! |
754 |
745 |
755 now let's see where we are, and update to the successor |
746 now let's see where we are, and update to the successor |
756 |
747 |
757 $ hg parents |
748 $ hg parents |
778 searching for changes |
769 searching for changes |
779 adding changesets |
770 adding changesets |
780 adding manifests |
771 adding manifests |
781 adding file changes |
772 adding file changes |
782 added 1 changesets with 1 changes to 1 files |
773 added 1 changesets with 1 changes to 1 files |
783 pull obsolescence markers |
|
784 0 obsolescence markers added |
|
785 (run 'hg update' to get a working copy) |
774 (run 'hg update' to get a working copy) |
786 $ hg log -G |
775 $ hg log -G |
787 o 99f039c5ec9e (draft): SPAM SPAM SPAM |
776 o 99f039c5ec9e (draft): SPAM SPAM SPAM |
788 | |
777 | |
789 @ ee942144f952 (draft): animals |
778 @ ee942144f952 (draft): animals |