equal
deleted
inserted
replaced
341 |
341 |
342 $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent |
342 $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent |
343 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
343 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
344 $ hg rebase --rev fac207dec9f5 --dest . # moving "SPAM SPAM" to the working directory parent |
344 $ hg rebase --rev fac207dec9f5 --dest . # moving "SPAM SPAM" to the working directory parent |
345 merging shopping |
345 merging shopping |
|
346 $ hg up tip |
|
347 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
346 $ hg log -G |
348 $ hg log -G |
347 @ a224f2a4fb9f (draft): SPAM SPAM |
349 @ a224f2a4fb9f (draft): SPAM SPAM |
348 | |
350 | |
349 | o 10b8aeaa8cc8 (draft): bathroom stuff |
351 | o 10b8aeaa8cc8 (draft): bathroom stuff |
350 |/ |
352 |/ |
399 |
401 |
400 for simplicity shake we get the bathroom change in line again |
402 for simplicity shake we get the bathroom change in line again |
401 |
403 |
402 $ hg rebase -r 10b8aeaa8cc8 -d a224f2a4fb9f |
404 $ hg rebase -r 10b8aeaa8cc8 -d a224f2a4fb9f |
403 merging shopping |
405 merging shopping |
|
406 $ hg up tip |
|
407 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
404 $ hg phase --draft . |
408 $ hg phase --draft . |
405 $ hg log -G |
409 $ hg log -G |
406 @ 75954b8cd933 (draft): bathroom stuff |
410 @ 75954b8cd933 (draft): bathroom stuff |
407 | |
411 | |
408 o a224f2a4fb9f (public): SPAM SPAM |
412 o a224f2a4fb9f (public): SPAM SPAM |