Mercurial > evolve

comparison tests/test-tutorial.t @ 1110:875e671c3cd8 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: add glob annotations where Mercurial's run-tests.py suggests These happen to also be 5 of the 6 tests that warn about no result code when run on Windows. Probably not a coincidence. The tests previously warned about no result code whether or not it was run interactively. They only started working when test output changes were accepted in interactive mode, and these globs were added automatically.
author Matt Harbison <matt_harbison@yahoo.com>
date Tue, 12 Aug 2014 21:02:34 -0400
parents bac4e0bc9f6a
children 6328e005b6c8
comparison
equal deleted inserted replaced
1109:212f24013455 1110:875e671c3cd8
90 adding shopping 90 adding shopping
91 91
92 Its first version is shared with the outside. 92 Its first version is shared with the outside.
93 93
94 $ hg push remote 94 $ hg push remote
95 pushing to $TESTTMP/remote 95 pushing to $TESTTMP/remote (glob)
96 searching for changes 96 searching for changes
97 adding changesets 97 adding changesets
98 adding manifests 98 adding manifests
99 adding file changes 99 adding file changes
100 added 1 changesets with 1 changes to 1 files 100 added 1 changesets with 1 changes to 1 files
216 $ cd ../local 216 $ cd ../local
217 217
218 I'll get this remote changeset when pulling 218 I'll get this remote changeset when pulling
219 219
220 $ hg pull remote 220 $ hg pull remote
221 pulling from $TESTTMP/remote 221 pulling from $TESTTMP/remote (glob)
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)
395 $ hg phase --force --secret 10b8aeaa8cc8 395 $ hg phase --force --secret 10b8aeaa8cc8
396 396
397 we can now push our change: 397 we can now push our change:
398 398
399 $ hg push remote 399 $ hg push remote
400 pushing to $TESTTMP/remote 400 pushing to $TESTTMP/remote (glob)
401 searching for changes 401 searching for changes
402 adding changesets 402 adding changesets
403 adding manifests 403 adding manifests
404 adding file changes 404 adding file changes
405 added 3 changesets with 3 changes to 1 files 405 added 3 changesets with 3 changes to 1 files
514 514
515 the localrepo does not have any specific configuration for `phases.publish`. It 515 the localrepo does not have any specific configuration for `phases.publish`. It
516 is ``true`` by default. 516 is ``true`` by default.
517 517
518 $ hg pull local 518 $ hg pull local
519 pulling from $TESTTMP/local 519 pulling from $TESTTMP/local (glob)
520 searching for changes 520 searching for changes
521 adding changesets 521 adding changesets
522 adding manifests 522 adding manifests
523 adding file changes 523 adding file changes
524 added 1 changesets with 1 changes to 1 files 524 added 1 changesets with 1 changes to 1 files
572 572
573 573
574 I can now exchange mutable changeset between "remote" and "local" repository. 574 I can now exchange mutable changeset between "remote" and "local" repository.
575 575
576 $ hg pull local 576 $ hg pull local
577 pulling from $TESTTMP/local 577 pulling from $TESTTMP/local (glob)
578 searching for changes 578 searching for changes
579 adding changesets 579 adding changesets
580 adding manifests 580 adding manifests
581 adding file changes 581 adding file changes
582 added 1 changesets with 1 changes to 1 files 582 added 1 changesets with 1 changes to 1 files
633 633
634 634
635 When we pull from remote again we get an unstable state! 635 When we pull from remote again we get an unstable state!
636 636
637 $ hg pull remote 637 $ hg pull remote
638 pulling from $TESTTMP/remote 638 pulling from $TESTTMP/remote (glob)
639 searching for changes 639 searching for changes
640 adding changesets 640 adding changesets
641 adding manifests 641 adding manifests
642 adding file changes 642 adding file changes
643 added 1 changesets with 1 changes to 1 files (+1 heads) 643 added 1 changesets with 1 changes to 1 files (+1 heads)
675 675
676 There is now an **unstable** changeset in this history. Mercurial will refuse to 676 There is now an **unstable** changeset in this history. Mercurial will refuse to
677 share it with the outside: 677 share it with the outside:
678 678
679 $ hg push other 679 $ hg push other
680 pushing to $TESTTMP/other 680 pushing to $TESTTMP/other (glob)
681 searching for changes 681 searching for changes
682 abort: push includes unstable changeset: bf1b0d202029! 682 abort: push includes unstable changeset: bf1b0d202029!
683 (use 'hg evolve' to get a stable history or --force to ignore warnings) 683 (use 'hg evolve' to get a stable history or --force to ignore warnings)
684 [255] 684 [255]
685 685
724 724
725 725
726 We can push this evolution to remote 726 We can push this evolution to remote
727 727
728 $ hg push remote 728 $ hg push remote
729 pushing to $TESTTMP/remote 729 pushing to $TESTTMP/remote (glob)
730 searching for changes 730 searching for changes
731 adding changesets 731 adding changesets
732 adding manifests 732 adding manifests
733 adding file changes 733 adding file changes
734 added 2 changesets with 2 changes to 1 files (+1 heads) 734 added 2 changesets with 2 changes to 1 files (+1 heads)
736 736
737 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
738 738
739 $ cd ../remote 739 $ cd ../remote
740 $ 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
741 pulling from $TESTTMP/local 741 pulling from $TESTTMP/local (glob)
742 searching for changes 742 searching for changes
743 no changes found 743 no changes found
744 pull obsolescence markers 744 pull obsolescence markers
745 0 obsolescence markers added 745 0 obsolescence markers added
746 working directory parent is obsolete! 746 working directory parent is obsolete!
765 765
766 I'm pulling its work locally. 766 I'm pulling its work locally.
767 767
768 $ cd ../local 768 $ cd ../local
769 $ hg pull remote 769 $ hg pull remote
770 pulling from $TESTTMP/remote 770 pulling from $TESTTMP/remote (glob)
771 searching for changes 771 searching for changes
772 adding changesets 772 adding changesets
773 adding manifests 773 adding manifests
774 adding file changes 774 adding file changes
775 added 1 changesets with 1 changes to 1 files 775 added 1 changesets with 1 changes to 1 files