--- a/tests/test-grab.t Tue Aug 28 11:24:52 2018 +0200
+++ b/tests/test-grab.t Mon Sep 03 22:06:12 2018 +0200
@@ -16,16 +16,18 @@
$ hg init repo
$ cd repo
$ hg help grab
- hg grab [-r] rev
+ hg pick [-r] rev
+
+ aliases: grab
grabs a commit, move it on the top of working directory parent and
updates to it.
options:
- -r --rev VALUE revision to grab
- -c --continue continue interrupted grab
- -a --abort abort interrupted grab
+ -r --rev VALUE revision to pick
+ -c --continue continue interrupted pick
+ -a --abort abort interrupted pick
(some details hidden, use --verbose to show complete help)
@@ -43,45 +45,45 @@
Grabbing an ancestor
- $ hg grab -r 7c3bad9141dc
- abort: cannot grab an ancestor revision
+ $ hg pick -r 7c3bad9141dc
+ abort: cannot pick an ancestor revision
[255]
Grabbing the working directory parent
- $ hg grab -r .
- abort: cannot grab an ancestor revision
+ $ hg pick -r .
+ abort: cannot pick an ancestor revision
[255]
Specifying multiple revisions to grab
- $ hg grab 1f0dee641bb7 -r 7c3bad9141dc
+ $ hg pick 1f0dee641bb7 -r 7c3bad9141dc
abort: specify just one revision
[255]
Specifying no revisions to grab
- $ hg grab
+ $ hg pick
abort: empty revision set
[255]
Continuing without interrupted grab
- $ hg grab --continue
- abort: no interrupted grab state exists
+ $ hg pick --continue
+ abort: no interrupted pick state exists
[255]
Aborting without interrupted grab
- $ hg grab --abort
- abort: no interrupted grab state exists
+ $ hg pick --abort
+ abort: no interrupted pick state exists
[255]
Specifying both continue and revs
$ hg up 1f0dee641bb7
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
- $ hg grab -r 4538525df7e2 --continue
+ $ hg pick -r 4538525df7e2 --continue
abort: cannot specify both --continue and revision
[255]
@@ -104,7 +106,7 @@
Grabbing a revision
- $ hg grab 7c3bad9141dc
+ $ hg pick 7c3bad9141dc
grabbing 1:7c3bad9141dc "add b"
$ hg glog
@ 5:7c15c05db6fa add b
@@ -140,9 +142,9 @@
|/
o 0:1f0dee641bb7 add a
- $ hg grab -r 4538525df7e2
- grabbing 2:4538525df7e2 "add c"
- note: grab of 2:4538525df7e2 created no changes to commit
+ $ hg pick -r 4538525df7e2
+ picking 2:4538525df7e2 "add c"
+ note: picking 2:4538525df7e2 created no changes to commit
$ hg glog
@ 6:c4636a81ebeb add c
@@ -161,8 +163,8 @@
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ echo foo > c
$ hg ci -Aqm "foo to c"
- $ hg grab -r c4636a81ebeb
- grabbing 6:c4636a81ebeb "add c"
+ $ hg pick -r c4636a81ebeb
+ picking 6:c4636a81ebeb "add c"
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved merge conflicts (see hg help resolve)
@@ -171,8 +173,8 @@
$ echo foobar > c
$ hg resolve --all --mark
(no more unresolved files)
- continue: hg grab --continue
- $ hg grab --continue
+ continue: hg pick --continue
+ $ hg pick --continue
$ hg glog
@ 8:44e155eb95c7 add c
|
@@ -199,8 +201,8 @@
$ hg up 44e155eb95c7
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ hg grab 4e04628911f6
- grabbing 9:4e04628911f6 "foo to c"
+ $ hg pick 4e04628911f6
+ picking 9:4e04628911f6 "foo to c"
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved merge conflicts (see hg help resolve)
@@ -208,12 +210,12 @@
$ echo foobar > c
$ hg resolve -m
(no more unresolved files)
- continue: hg grab --continue
+ continue: hg pick --continue
- $ hg grab --continue
- note: grab of 9:4e04628911f6 created no changes to commit
+ $ hg pick --continue
+ note: picking 9:4e04628911f6 created no changes to commit
-Testing the abort functionality of hg grab
+Testing the abort functionality of hg pick
$ echo foo > b
$ hg ci -Aqm "foo to b"
@@ -221,15 +223,15 @@
hg: parse error at 4: not a prefix: end
[255]
- $ hg grab -r 7c15c05db6fa
- grabbing 5:7c15c05db6fa "add b"
+ $ hg pick -r 7c15c05db6fa
+ picking 5:7c15c05db6fa "add b"
merging b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
unresolved merge conflicts (see hg help resolve)
[1]
- $ hg grab --abort
- aborting grab, updating to c437988de89f
+ $ hg pick --abort
+ aborting pick, updating to c437988de89f
$ hg glog
@ 10:c437988de89f foo to b
@@ -251,8 +253,8 @@
$ hg phase -r 7c15c05db6fa -p
- $ hg grab -r 7c15c05db6fa
- abort: cannot grab public changesets: 7c15c05db6fa
+ $ hg pick -r 7c15c05db6fa
+ abort: cannot pick public changesets: 7c15c05db6fa
(see 'hg help phases' for details)
[255]
@@ -277,8 +279,8 @@
$ hg phase -r 7c15c05db6fa -s -f
- $ hg grab -r 7c15c05db6fa
- grabbing 5:7c15c05db6fa "add b"
+ $ hg pick -r 7c15c05db6fa
+ picking 5:7c15c05db6fa "add b"
merging b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
unresolved merge conflicts (see hg help resolve)
@@ -287,9 +289,9 @@
$ echo bar > b
$ hg resolve -m
(no more unresolved files)
- continue: hg grab --continue
+ continue: hg pick --continue
- $ hg grab --continue
+ $ hg pick --continue
$ hg phase -r .
11: secret
@@ -324,8 +326,8 @@
$ hg up 10427de9e26e
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
- $ hg grab -r 508d572e7053
- grabbing 12:508d572e7053 "added l"
+ $ hg pick -r 508d572e7053
+ picking 12:508d572e7053 "added l"
$ hg phase -r .
13: secret