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