equal
deleted
inserted
replaced
57 |
57 |
58 And the graphlog extension |
58 And the graphlog extension |
59 $ hg showconfig extensions |
59 $ hg showconfig extensions |
60 extensions.hgext.graphlog= |
60 extensions.hgext.graphlog= |
61 |
61 |
62 And of course, we anabled the experimental extensions for mutable history: |
62 And of course, we enable the experimental extensions for mutable history: |
63 |
63 |
64 $ $(dirname $TESTDIR)/enable.sh >> $HGRCPATH 2> /dev/null |
64 $ cat >> $HGRCPATH <<EOF |
65 |
65 > [extensions] |
|
66 > rebase = |
|
67 > evolve = $TESTDIR/../hgext/evolve.py |
|
68 > EOF |
66 |
69 |
67 ----------------------- |
70 ----------------------- |
68 Single Developer Usage |
71 Single Developer Usage |
69 ----------------------- |
72 ----------------------- |
70 |
73 |
398 adding file changes |
401 adding file changes |
399 added 3 changesets with 3 changes to 1 files |
402 added 3 changesets with 3 changes to 1 files |
400 |
403 |
401 for simplicity shake we get the bathroom change in line again |
404 for simplicity shake we get the bathroom change in line again |
402 |
405 |
403 $ hg rebase -Dr 8d39a843582d -d a2fccc2e7b08 |
406 $ hg rebase -r 8d39a843582d -d a2fccc2e7b08 |
404 merging shopping |
407 merging shopping |
405 $ hg phase --draft . |
408 $ hg phase --draft . |
406 $ hg log -G |
409 $ hg log -G |
407 @ 8a79ae8b029e (draft): bathroom stuff |
410 @ 8a79ae8b029e (draft): bathroom stuff |
408 | |
411 | |
622 It has a --dry-run option to only suggest the next move. |
625 It has a --dry-run option to only suggest the next move. |
623 |
626 |
624 $ hg evolve --dry-run |
627 $ hg evolve --dry-run |
625 move:[15] animals |
628 move:[15] animals |
626 atop:[14] bathroom stuff |
629 atop:[14] bathroom stuff |
627 hg rebase -Dr 9ac5d0e790a2 -d ffa278c50818 |
630 hg rebase -r 9ac5d0e790a2 -d ffa278c50818 |
628 |
631 |
629 Let's do it |
632 Let's do it |
630 |
633 |
631 $ hg rebase -Dr 9ac5d0e790a2 -d ffa278c50818 |
634 $ hg rebase -r 9ac5d0e790a2 -d ffa278c50818 |
632 merging shopping |
635 merging shopping |
633 |
636 |
634 The old version of bathroom is hidden again. |
637 The old version of bathroom is hidden again. |
635 |
638 |
636 $ hg log -G |
639 $ hg log -G |