Mercurial > evolve

comparison tests/test-tutorial.t @ 1035:59bc29c84ce0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: hide the OBSEXC message behind a config option This will lets most people ignore them while keep evolve dev having a close look at them. Some of the most useful messages will be reintroduced for all in coming changeset.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 08 Aug 2014 17:16:29 -0700
parents b98dd5d3065c
children 70de12b7721a
comparison
equal deleted inserted replaced
1034:5fd28e46e8f5 1035:59bc29c84ce0
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 OBSEXC: pull obsolescence markers
228 OBSEXC: no unknown remote markers
229 OBSEXC: DONE
230 (run 'hg heads' to see heads, 'hg merge' to merge) 227 (run 'hg heads' to see heads, 'hg merge' to merge)
231 228
232 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
233 230
234 $ hg log -G 231 $ hg log -G
403 searching for changes 400 searching for changes
404 adding changesets 401 adding changesets
405 adding manifests 402 adding manifests
406 adding file changes 403 adding file changes
407 added 3 changesets with 3 changes to 1 files 404 added 3 changesets with 3 changes to 1 files
408 OBSEXC: computing relevant nodes
409 OBSEXC: computing markers relevant to 5 nodes
410 OBSEXC: pushing 6 markers (487 bytes)
411 OBSEXC: DONE
412 405
413 for simplicity sake we get the bathroom change in line again 406 for simplicity sake we get the bathroom change in line again
414 407
415 $ hg grab 10b8aeaa8cc8 408 $ hg grab 10b8aeaa8cc8
416 merging shopping 409 merging shopping
524 searching for changes 517 searching for changes
525 adding changesets 518 adding changesets
526 adding manifests 519 adding manifests
527 adding file changes 520 adding file changes
528 added 1 changesets with 1 changes to 1 files 521 added 1 changesets with 1 changes to 1 files
529 OBSEXC: pull obsolescence markers
530 OBSEXC: merging obsolescence markers (560 bytes)
531 OBSEXC: 1 markers added
532 OBSEXC: DONE
533 (run 'hg update' to get a working copy) 522 (run 'hg update' to get a working copy)
534 $ hg log -G 523 $ hg log -G
535 o 75954b8cd933 (public): bathroom stuff 524 o 75954b8cd933 (public): bathroom stuff
536 | 525 |
537 o a224f2a4fb9f (public): SPAM SPAM 526 o a224f2a4fb9f (public): SPAM SPAM
584 searching for changes 573 searching for changes
585 adding changesets 574 adding changesets
586 adding manifests 575 adding manifests
587 adding file changes 576 adding file changes
588 added 1 changesets with 1 changes to 1 files 577 added 1 changesets with 1 changes to 1 files
589 OBSEXC: pull obsolescence markers
590 OBSEXC: merging obsolescence markers (560 bytes)
591 OBSEXC: 1 markers added
592 OBSEXC: DONE
593 (run 'hg update' to get a working copy) 578 (run 'hg update' to get a working copy)
594 $ hg log -G 579 $ hg log -G
595 o 75954b8cd933 (draft): bathroom stuff 580 o 75954b8cd933 (draft): bathroom stuff
596 | 581 |
597 o a224f2a4fb9f (public): SPAM SPAM 582 o a224f2a4fb9f (public): SPAM SPAM
647 searching for changes 632 searching for changes
648 adding changesets 633 adding changesets
649 adding manifests 634 adding manifests
650 adding file changes 635 adding file changes
651 added 1 changesets with 1 changes to 1 files (+1 heads) 636 added 1 changesets with 1 changes to 1 files (+1 heads)
652 OBSEXC: pull obsolescence markers
653 OBSEXC: merging obsolescence markers (560 bytes)
654 OBSEXC: 0 markers added
655 OBSEXC: DONE
656 (run 'hg heads' to see heads, 'hg merge' to merge) 637 (run 'hg heads' to see heads, 'hg merge' to merge)
657 1 new unstable changesets 638 1 new unstable changesets
658 639
659 640
660 The new changeset "animal" is based on an old changeset of "bathroom". You can 641 The new changeset "animal" is based on an old changeset of "bathroom". You can
739 searching for changes 720 searching for changes
740 adding changesets 721 adding changesets
741 adding manifests 722 adding manifests
742 adding file changes 723 adding file changes
743 added 2 changesets with 2 changes to 1 files (+1 heads) 724 added 2 changesets with 2 changes to 1 files (+1 heads)
744 OBSEXC: computing relevant nodes
745 OBSEXC: computing markers relevant to 7 nodes
746 OBSEXC: pushing 10 markers (803 bytes)
747 OBSEXC: DONE
748 725
749 remote get a warning that current working directory is based on an obsolete changeset 726 remote get a warning that current working directory is based on an obsolete changeset
750 727
751 $ cd ../remote 728 $ cd ../remote
752 $ hg pull local # we up again to trigger the warning. it was displayed during the push 729 $ hg pull local # we up again to trigger the warning. it was displayed during the push
753 pulling from $TESTTMP/local 730 pulling from $TESTTMP/local
754 searching for changes 731 searching for changes
755 no changes found 732 no changes found
756 OBSEXC: pull obsolescence markers
757 OBSEXC: merging obsolescence markers (803 bytes)
758 OBSEXC: 0 markers added
759 OBSEXC: DONE
760 working directory parent is obsolete! 733 working directory parent is obsolete!
761 734
762 now let's see where we are, and update to the successor 735 now let's see where we are, and update to the successor
763 736
764 $ hg parents 737 $ hg parents
784 searching for changes 757 searching for changes
785 adding changesets 758 adding changesets
786 adding manifests 759 adding manifests
787 adding file changes 760 adding file changes
788 added 1 changesets with 1 changes to 1 files 761 added 1 changesets with 1 changes to 1 files
789 OBSEXC: pull obsolescence markers
790 OBSEXC: merging obsolescence markers (803 bytes)
791 OBSEXC: 0 markers added
792 OBSEXC: DONE
793 (run 'hg update' to get a working copy) 762 (run 'hg update' to get a working copy)
794 $ hg log -G 763 $ hg log -G
795 o 99f039c5ec9e (draft): SPAM SPAM SPAM 764 o 99f039c5ec9e (draft): SPAM SPAM SPAM
796 | 765 |
797 @ ee942144f952 (draft): animals 766 @ ee942144f952 (draft): animals