equal
deleted
inserted
replaced
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 |