equal
deleted
inserted
replaced
401 adding file changes |
401 adding file changes |
402 added 3 changesets with 3 changes to 1 files |
402 added 3 changesets with 3 changes to 1 files |
403 |
403 |
404 for simplicity shake we get the bathroom change in line again |
404 for simplicity shake we get the bathroom change in line again |
405 |
405 |
406 $ hg rebase -Dr 8d39a843582d -d a2fccc2e7b08 |
406 $ hg rebase -r 8d39a843582d -d a2fccc2e7b08 |
407 merging shopping |
407 merging shopping |
408 $ hg phase --draft . |
408 $ hg phase --draft . |
409 $ hg log -G |
409 $ hg log -G |
410 @ 8a79ae8b029e (draft): bathroom stuff |
410 @ 8a79ae8b029e (draft): bathroom stuff |
411 | |
411 | |
629 atop:[14] bathroom stuff |
629 atop:[14] bathroom stuff |
630 hg rebase -r 9ac5d0e790a2 -d ffa278c50818 |
630 hg rebase -r 9ac5d0e790a2 -d ffa278c50818 |
631 |
631 |
632 Let's do it |
632 Let's do it |
633 |
633 |
634 $ hg rebase -Dr 9ac5d0e790a2 -d ffa278c50818 |
634 $ hg rebase -r 9ac5d0e790a2 -d ffa278c50818 |
635 merging shopping |
635 merging shopping |
636 |
636 |
637 The old version of bathroom is hidden again. |
637 The old version of bathroom is hidden again. |
638 |
638 |
639 $ hg log -G |
639 $ hg log -G |