# HG changeset patch # User Pierre-Yves David # Date 1389330969 28800 # Node ID 27b3442f08d965b729123d83a1555b9a91bbe8ed # Parent 126e31c7658b6b4e373382d70600c96668238496 tutorial: use grab instead of rebase. grab as now the advantage to move the working directory. diff -r 126e31c7658b -r 27b3442f08d9 tests/test-tutorial.t --- a/tests/test-tutorial.t Thu Jan 09 21:14:41 2014 -0800 +++ b/tests/test-tutorial.t Thu Jan 09 21:16:09 2014 -0800 @@ -340,13 +340,14 @@ not totally happy with yet. To be able to push "SPAM SPAM" I need a version of "SPAM SPAM" which is not a child of "bathroom stuff" -You can use 'rebase -r' or 'grab' for that: +You can use the 'grab' alias for that. + +.. note: grab is an alias for `hg rebase --dest . --rev ; hg up ` $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg rebase --rev fac207dec9f5 --dest . # moving "SPAM SPAM" to the working directory parent + $ hg grab fac207dec9f5 # moving "SPAM SPAM" to the working directory parent merging shopping - $ hg up tip ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) $ hg log -G @ a224f2a4fb9f (draft): SPAM SPAM @@ -404,9 +405,8 @@ for simplicity sake we get the bathroom change in line again - $ hg rebase -r 10b8aeaa8cc8 -d a224f2a4fb9f + $ hg grab 10b8aeaa8cc8 merging shopping - $ hg up tip ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) $ hg phase --draft . $ hg log -G