338 |
338 |
339 I now want to push to remote all my changes except the bathroom one, which I'm |
339 I now want to push to remote all my changes except the bathroom one, which I'm |
340 not totally happy with yet. To be able to push "SPAM SPAM" I need a version of |
340 not totally happy with yet. To be able to push "SPAM SPAM" I need a version of |
341 "SPAM SPAM" which is not a child of "bathroom stuff" |
341 "SPAM SPAM" which is not a child of "bathroom stuff" |
342 |
342 |
343 You can use 'rebase -r' or 'grab' for that: |
343 You can use the 'grab' alias for that. |
|
344 |
|
345 .. note: grab is an alias for `hg rebase --dest . --rev <target>; hg up <there>` |
344 |
346 |
345 $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent |
347 $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent |
346 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
348 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
347 $ hg rebase --rev fac207dec9f5 --dest . # moving "SPAM SPAM" to the working directory parent |
349 $ hg grab fac207dec9f5 # moving "SPAM SPAM" to the working directory parent |
348 merging shopping |
350 merging shopping |
349 $ hg up tip |
|
350 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
351 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
351 $ hg log -G |
352 $ hg log -G |
352 @ a224f2a4fb9f (draft): SPAM SPAM |
353 @ a224f2a4fb9f (draft): SPAM SPAM |
353 | |
354 | |
354 | o 10b8aeaa8cc8 (draft): bathroom stuff |
355 | o 10b8aeaa8cc8 (draft): bathroom stuff |
402 adding file changes |
403 adding file changes |
403 added 3 changesets with 3 changes to 1 files |
404 added 3 changesets with 3 changes to 1 files |
404 |
405 |
405 for simplicity sake we get the bathroom change in line again |
406 for simplicity sake we get the bathroom change in line again |
406 |
407 |
407 $ hg rebase -r 10b8aeaa8cc8 -d a224f2a4fb9f |
408 $ hg grab 10b8aeaa8cc8 |
408 merging shopping |
409 merging shopping |
409 $ hg up tip |
|
410 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
410 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
411 $ hg phase --draft . |
411 $ hg phase --draft . |
412 $ hg log -G |
412 $ hg log -G |
413 @ 75954b8cd933 (draft): bathroom stuff |
413 @ 75954b8cd933 (draft): bathroom stuff |
414 | |
414 | |