Mercurial > evolve

changeset 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 73e73471d6c6
children 46cd437fd3d2
files tests/test-evolve-abort-phasediv.t tests/test-evolve-issue5832.t tests/test-evolve-stop-phasediv.t tests/test-evolve.t tests/test-grab.t tests/test-stabilize-result.t tests/test-tutorial.t
diffstat 7 files changed, 31 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-evolve-abort-phasediv.t	Fri Aug 31 09:20:21 2018 +0200
+++ b/tests/test-evolve-abort-phasediv.t	Fri Aug 31 09:21:19 2018 +0200
@@ -43,7 +43,7 @@
 
   $ hg up .^^^
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
-  $ hg grab -r .~-3
+  $ hg pick -r .~-3
   picking 4:c41c793e0ef1 "added d"
   $ echo foobar > c
   $ hg add c
@@ -151,7 +151,7 @@
   $ hg prev
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   [1] added a
-  $ hg grab -r ca1b80f
+  $ hg pick -r ca1b80f
   picking 3:ca1b80f7960a "added c"
   $ echo foobar > b
   $ hg add b
--- a/tests/test-evolve-issue5832.t	Fri Aug 31 09:20:21 2018 +0200
+++ b/tests/test-evolve-issue5832.t	Fri Aug 31 09:21:19 2018 +0200
@@ -191,7 +191,7 @@
   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   $ echo l > l
   $ hg ci -Aqm "added l"
-  $ hg grab -r 1b24879c5c3c
+  $ hg pick -r 1b24879c5c3c
   picking 1:1b24879c5c3c "added a"
   2 new orphan changesets
 
@@ -337,7 +337,7 @@
   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   $ echo l > l
   $ hg ci -Aqm "added l"
-  $ hg grab -r 1b24879c5c3c
+  $ hg pick -r 1b24879c5c3c
   picking 1:1b24879c5c3c "added a"
   2 new orphan changesets
 
--- a/tests/test-evolve-stop-phasediv.t	Fri Aug 31 09:20:21 2018 +0200
+++ b/tests/test-evolve-stop-phasediv.t	Fri Aug 31 09:21:19 2018 +0200
@@ -40,7 +40,7 @@
 
   $ hg up .^^^
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
-  $ hg grab -r .~-3
+  $ hg pick -r .~-3
   picking 4:c41c793e0ef1 "added d"
   $ echo foobar > c
   $ hg add c
--- a/tests/test-evolve.t	Fri Aug 31 09:20:21 2018 +0200
+++ b/tests/test-evolve.t	Fri Aug 31 09:21:19 2018 +0200
@@ -596,7 +596,7 @@
   |/
   o  0:8685c6d34325@default(draft) add 0
   
-  $ hg grab -r3
+  $ hg pick -r3
   picking 3:0e84df4912da "add 3"
   $ hg graft -r1
   grafting 1:73d38bb17fd7 "add 1"
@@ -628,7 +628,7 @@
   $ hg ci -Am conflict 1
   created new head
   $ hg up -qC 6
-  $ hg grab -r 7
+  $ hg pick -r 7
   picking 7:a5bfd90a2f29 "conflict"
   merging 1
   warning: conflicts while merging 1! (edit, then use 'hg resolve --mark')
@@ -640,7 +640,7 @@
   $ hg resolve -m 1
   (no more unresolved files)
   continue: hg pick --continue
-  $ hg grab --continue
+  $ hg pick --continue
   $ glog --hidden
   @  8:fb2c0f0a0c54@default(draft) conflict
   |
--- a/tests/test-grab.t	Fri Aug 31 09:20:21 2018 +0200
+++ b/tests/test-grab.t	Fri Aug 31 09:21:19 2018 +0200
@@ -45,37 +45,37 @@
 
 Grabbing an ancestor
 
-  $ hg grab -r 7c3bad9141dc
+  $ hg pick -r 7c3bad9141dc
   abort: cannot pick an ancestor revision
   [255]
 
 Grabbing the working directory parent
 
-  $ hg grab -r .
+  $ 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
+  $ hg pick --continue
   abort: no interrupted pick state exists
   [255]
 
 Aborting without interrupted grab
 
-  $ hg grab --abort
+  $ hg pick --abort
   abort: no interrupted pick state exists
   [255]
 
@@ -83,7 +83,7 @@
 
   $ 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]
 
@@ -106,7 +106,7 @@
   
 Grabbing a revision
 
-  $ hg grab 7c3bad9141dc
+  $ hg pick 7c3bad9141dc
   picking 1:7c3bad9141dc "add b"
   1 new orphan changesets
   $ hg glog
@@ -143,7 +143,7 @@
   |/
   o  0:1f0dee641bb7 add a
   
-  $ hg grab -r 4538525df7e2
+  $ hg pick -r 4538525df7e2
   picking 2:4538525df7e2 "add c"
   note: picking 2:4538525df7e2 created no changes to commit
 
@@ -164,7 +164,7 @@
   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
+  $ hg pick -r c4636a81ebeb
   picking 6:c4636a81ebeb "add c"
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
@@ -175,7 +175,7 @@
   $ hg resolve --all --mark
   (no more unresolved files)
   continue: hg pick --continue
-  $ hg grab --continue
+  $ hg pick --continue
   $ hg glog
   @  8:44e155eb95c7 add c
   |
@@ -202,7 +202,7 @@
   $ hg up 44e155eb95c7
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
-  $ hg grab 4e04628911f6
+  $ hg pick 4e04628911f6
   picking 9:4e04628911f6 "foo to c"
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
@@ -213,10 +213,10 @@
   (no more unresolved files)
   continue: hg pick --continue
 
-  $ hg grab --continue
+  $ 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"
@@ -227,14 +227,14 @@
   |
   ~
 
-  $ hg grab -r 7c15c05db6fa
+  $ 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
+  $ hg pick --abort
   aborting pick, updating to c437988de89f
 
   $ hg glog
@@ -257,7 +257,7 @@
 
   $ hg phase -r 7c15c05db6fa -p
 
-  $ hg grab -r 7c15c05db6fa
+  $ hg pick -r 7c15c05db6fa
   abort: cannot pick public changesets: 7c15c05db6fa
   (see 'hg help phases' for details)
   [255]
@@ -283,7 +283,7 @@
 
   $ hg phase -r 7c15c05db6fa -s -f
 
-  $ hg grab -r 7c15c05db6fa
+  $ hg pick -r 7c15c05db6fa
   picking 5:7c15c05db6fa "add b"
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
@@ -295,7 +295,7 @@
   (no more unresolved files)
   continue: hg pick --continue
 
-  $ hg grab --continue
+  $ hg pick --continue
   $ hg phase -r .
   11: secret
 
@@ -330,7 +330,7 @@
   $ hg up 10427de9e26e
   3 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
-  $ hg grab -r 508d572e7053
+  $ hg pick -r 508d572e7053
   picking 12:508d572e7053 "added l"
 
   $ hg phase -r .
--- a/tests/test-stabilize-result.t	Fri Aug 31 09:20:21 2018 +0200
+++ b/tests/test-stabilize-result.t	Fri Aug 31 09:21:19 2018 +0200
@@ -128,7 +128,7 @@
 
 Get a successors of 8 on it
 
-  $ hg grab 1cf0aacfd363
+  $ hg pick 1cf0aacfd363
   picking 6:1cf0aacfd363 "newer a"
 
 Add real change to the successors
--- a/tests/test-tutorial.t	Fri Aug 31 09:20:21 2018 +0200
+++ b/tests/test-tutorial.t	Fri Aug 31 09:21:19 2018 +0200
@@ -664,7 +664,7 @@
 
   $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg grab fac207dec9f5 # moving "SPAM SPAM" to the working directory parent
+  $ hg pick fac207dec9f5 # moving "SPAM SPAM" to the working directory parent
   picking 9:fac207dec9f5 "SPAM SPAM"
   merging shopping
   $ hg log -G
@@ -806,7 +806,7 @@
 
 for simplicity sake we get the bathroom change in line again
 
-  $ hg grab 10b8aeaa8cc8
+  $ hg pick 10b8aeaa8cc8
   picking 8:10b8aeaa8cc8 "bathroom stuff"
   merging shopping
   $ hg phase --draft .