equal
deleted
inserted
replaced
241 |
241 |
242 instead of merging my head with the new one. I'm going to rebase my work |
242 instead of merging my head with the new one. I'm going to rebase my work |
243 |
243 |
244 $ hg diff |
244 $ hg diff |
245 $ hg rebase --dest 9ca060c80d74 --source 4d5dc8187023 |
245 $ hg rebase --dest 9ca060c80d74 --source 4d5dc8187023 |
|
246 rebasing 1:4d5dc8187023 "adding condiment" |
246 merging shopping |
247 merging shopping |
|
248 rebasing 4:9d0363b81950 "adding fruit" |
247 merging shopping |
249 merging shopping |
248 |
250 |
249 |
251 |
250 My local work is now rebased on the remote one. |
252 My local work is now rebased on the remote one. |
251 |
253 |
346 .. note: grab is an alias for `hg rebase --dest . --rev <target>; hg up <there>` |
348 .. note: grab is an alias for `hg rebase --dest . --rev <target>; hg up <there>` |
347 |
349 |
348 $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent |
350 $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent |
349 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
351 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
350 $ hg grab fac207dec9f5 # moving "SPAM SPAM" to the working directory parent |
352 $ hg grab fac207dec9f5 # moving "SPAM SPAM" to the working directory parent |
|
353 rebasing 10:fac207dec9f5 "SPAM SPAM" (tip) |
351 merging shopping |
354 merging shopping |
352 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
355 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
353 $ hg log -G |
356 $ hg log -G |
354 @ a224f2a4fb9f (draft): SPAM SPAM |
357 @ a224f2a4fb9f (draft): SPAM SPAM |
355 | |
358 | |
407 6 obsolescence markers added |
410 6 obsolescence markers added |
408 |
411 |
409 for simplicity sake we get the bathroom change in line again |
412 for simplicity sake we get the bathroom change in line again |
410 |
413 |
411 $ hg grab 10b8aeaa8cc8 |
414 $ hg grab 10b8aeaa8cc8 |
|
415 rebasing 9:10b8aeaa8cc8 "bathroom stuff" |
412 merging shopping |
416 merging shopping |
413 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
417 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
414 $ hg phase --draft . |
418 $ hg phase --draft . |
415 $ hg log -G |
419 $ hg log -G |
416 @ 75954b8cd933 (draft): bathroom stuff |
420 @ 75954b8cd933 (draft): bathroom stuff |