Mercurial > evolve

comparison tests/test-tutorial.t @ 4053:ecbf61d90807

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pick: replace `hg grab` invocation in test with `hg pick`
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 31 Aug 2018 09:21:19 +0200
parents 25981fae92f9
children f9a850018daa ef22eef37ecc
comparison
equal deleted inserted replaced
4052:73e73471d6c6 4053:ecbf61d90807
662 662
663 .. note: grab is an alias for `hg rebase --dest . --rev <target>; hg up <there>` 663 .. note: grab is an alias for `hg rebase --dest . --rev <target>; hg up <there>`
664 664
665 $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent 665 $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent
666 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 666 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
667 $ hg grab fac207dec9f5 # moving "SPAM SPAM" to the working directory parent 667 $ hg pick fac207dec9f5 # moving "SPAM SPAM" to the working directory parent
668 picking 9:fac207dec9f5 "SPAM SPAM" 668 picking 9:fac207dec9f5 "SPAM SPAM"
669 merging shopping 669 merging shopping
670 $ hg log -G 670 $ hg log -G
671 @ 57e9caedbcb8 (draft): SPAM SPAM 671 @ 57e9caedbcb8 (draft): SPAM SPAM
672 | 672 |
804 added 3 changesets with 3 changes to 1 files 804 added 3 changesets with 3 changes to 1 files
805 5 new obsolescence markers 805 5 new obsolescence markers
806 806
807 for simplicity sake we get the bathroom change in line again 807 for simplicity sake we get the bathroom change in line again
808 808
809 $ hg grab 10b8aeaa8cc8 809 $ hg pick 10b8aeaa8cc8
810 picking 8:10b8aeaa8cc8 "bathroom stuff" 810 picking 8:10b8aeaa8cc8 "bathroom stuff"
811 merging shopping 811 merging shopping
812 $ hg phase --draft . 812 $ hg phase --draft .
813 $ hg log -G 813 $ hg log -G
814 @ 4710c0968793 (draft): bathroom stuff 814 @ 4710c0968793 (draft): bathroom stuff