Mercurial > evolve
comparison tests/test-tutorial.t @ 696:121e2d265e85 stable
alias: add a grab alias
Its a valid replacement for graft -O
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Fri, 08 Feb 2013 20:45:18 +0000 |
| parents | f2c3fd21fa63 |
| children | 06cd220141ba |
comparison
equal
deleted
inserted
replaced
| 695:7daf42959b72 | 696:121e2d265e85 |
|---|---|
| 333 | 333 |
| 334 I now want to push to remote all my changes except the bathroom one, which I'm not | 334 I now want to push to remote all my changes except the bathroom one, which I'm not |
| 335 totally happy with yet. To be able to push "SPAM SPAM" I need a version of "SPAM SPAM" which is not a child of | 335 totally happy with yet. To be able to push "SPAM SPAM" I need a version of "SPAM SPAM" which is not a child of |
| 336 "bathroom stuff" | 336 "bathroom stuff" |
| 337 | 337 |
| 338 You can use 'rebase -r' or 'graft -O' for that: | 338 You can use 'rebase -r' or 'grab' for that: |
| 339 | 339 |
| 340 $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent | 340 $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent |
| 341 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 341 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 342 $ hg rebase --rev fac207dec9f5 --dest . # moving "SPAM SPAM" to the working directory parent | 342 $ hg rebase --rev fac207dec9f5 --dest . # moving "SPAM SPAM" to the working directory parent |
| 343 merging shopping | 343 merging shopping |