Mercurial > evolve
diff tests/test-tutorial.t @ 4053:ecbf61d90807
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 |
line wrap: on
line diff
--- 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 .