Mercurial > evolve
diff tests/test-stabilize-result.t @ 3453:32ed5b6fadd3
grab: add a command to grab a commit and update to it
This patch adds anew command `hg grab` which will pick a commit and put it on
the top of the working directory parent and updates to it.
Earlier grab was an alias for `hg rebase -r <rev> -d .` which is now deleted to
make sure `hg grab` resolves to the grab command and that alias.
Continuing interrupted grab functionality is also there using the evolvestate
class.
Tests are also added for the new introduced command.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Thu, 11 Jan 2018 20:03:20 +0530 |
parents | f57be161f34b |
children | 05bd493d496d |
line wrap: on
line diff
--- a/tests/test-stabilize-result.t Wed Jan 24 15:20:29 2018 +0100 +++ b/tests/test-stabilize-result.t Thu Jan 11 20:03:20 2018 +0530 @@ -127,8 +127,7 @@ Get a successors of 8 on it $ hg grab 1cf0aacfd363 - rebasing 6:1cf0aacfd363 "newer a" - ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) + grabbing 6:1cf0aacfd363 "newer a" Add real change to the successors @@ -140,7 +139,7 @@ $ hg phase --hidden --public 1cf0aacfd363 1 new phase-divergent changesets $ glog - @ 9:(73b15c7566e9|d5c7ef82d003)@default\(draft\) bk:\[\] newer a (re) + @ 9:99c21c89bcef@default(draft) bk:[] newer a | o 7:7bc2f5967f5e@default(draft) bk:[] add c | @@ -156,10 +155,10 @@ $ hg evolve --any --dry-run --phase-divergent recreate:[9] newer a atop:[6] newer a - hg rebase --rev d5c7ef82d003 --dest 66719795a494; + hg rebase --rev 99c21c89bcef --dest 66719795a494; hg update 1cf0aacfd363; - hg revert --all --rev d5c7ef82d003; - hg commit --msg "phase-divergent update to d5c7ef82d003" + hg revert --all --rev 99c21c89bcef; + hg commit --msg "phase-divergent update to 99c21c89bcef" $ hg evolve --any --confirm --phase-divergent recreate:[9] newer a atop:[6] newer a @@ -172,10 +171,10 @@ perform evolve? [Ny] y rebasing to destination parent: 66719795a494 computing new diff - committed as 8c986e77913c - working directory is now at 8c986e77913c + committed as 3d968e0b3097 + working directory is now at 3d968e0b3097 $ glog - @ 11:8c986e77913c@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: + @ 11:3d968e0b3097@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: | | o 7:7bc2f5967f5e@default(draft) bk:[] add c | | @@ -204,7 +203,7 @@ $ glog @ 12:3932c176bbaa@default(draft) bk:[] More addition | - | o 11:8c986e77913c@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: + | o 11:3d968e0b3097@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: | | o | 7:7bc2f5967f5e@default(draft) bk:[] add c | | @@ -233,7 +232,7 @@ | | * 13:d2f173e25686@default(draft) bk:[] More addition |/ - | o 11:8c986e77913c@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: + | o 11:3d968e0b3097@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: | | o | 7:7bc2f5967f5e@default(draft) bk:[] add c | | @@ -283,7 +282,7 @@ $ glog @ 15:f344982e63c4@default(draft) bk:[] More addition | - | o 11:8c986e77913c@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: + | o 11:3d968e0b3097@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: | | o | 7:7bc2f5967f5e@default(draft) bk:[] add c | |