Mercurial > evolve

comparison tests/test-tutorial.t @ 4077:9c025ec4af88 mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.4 into mercurial-4.3
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 03 Sep 2018 22:09:26 +0200
parents 98941c28f3e2 f9a850018daa
children e07e764c0f48
comparison
equal deleted inserted replaced
4033:b609412b42b0 4077:9c025ec4af88
634 634
635 .. note: grab is an alias for `hg rebase --dest . --rev <target>; hg up <there>` 635 .. note: grab is an alias for `hg rebase --dest . --rev <target>; hg up <there>`
636 636
637 $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent 637 $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent
638 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 638 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
639 $ hg grab fac207dec9f5 # moving "SPAM SPAM" to the working directory parent 639 $ hg pick fac207dec9f5 # moving "SPAM SPAM" to the working directory parent
640 grabbing 10:fac207dec9f5 "SPAM SPAM" 640 picking 10:fac207dec9f5 "SPAM SPAM"
641 merging shopping 641 merging shopping
642 $ hg log -G 642 $ hg log -G
643 @ 57e9caedbcb8 (draft): SPAM SPAM 643 @ 57e9caedbcb8 (draft): SPAM SPAM
644 | 644 |
645 | o 10b8aeaa8cc8 (draft): bathroom stuff 645 | o 10b8aeaa8cc8 (draft): bathroom stuff
738 added 3 changesets with 3 changes to 1 files 738 added 3 changesets with 3 changes to 1 files
739 6 new obsolescence markers 739 6 new obsolescence markers
740 740
741 for simplicity sake we get the bathroom change in line again 741 for simplicity sake we get the bathroom change in line again
742 742
743 $ hg grab 10b8aeaa8cc8 743 $ hg pick 10b8aeaa8cc8
744 grabbing 9:10b8aeaa8cc8 "bathroom stuff" 744 picking 9:10b8aeaa8cc8 "bathroom stuff"
745 merging shopping 745 merging shopping
746 $ hg phase --draft . 746 $ hg phase --draft .
747 $ hg log -G 747 $ hg log -G
748 @ 4710c0968793 (draft): bathroom stuff 748 @ 4710c0968793 (draft): bathroom stuff
749 | 749 |