Mercurial > evolve
comparison tests/test-tutorial.t @ 639:bc2527223350 stable
tutorial: use evolve directly
We a real mode in addition to the dry run one.
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Wed, 02 Jan 2013 13:48:48 +0100 |
parents | 8fd7ac58b762 |
children | 629ec7f612aa |
comparison
equal
deleted
inserted
replaced
638:8fd7ac58b762 | 639:bc2527223350 |
---|---|
621 atop:[14] bathroom stuff | 621 atop:[14] bathroom stuff |
622 hg rebase -r 0b061760b677 -d 36b5ba414186 | 622 hg rebase -r 0b061760b677 -d 36b5ba414186 |
623 | 623 |
624 Let's do it | 624 Let's do it |
625 | 625 |
626 $ hg rebase -r 0b061760b677 -d 36b5ba414186 | 626 $ hg evolve |
627 move:[15] animals | |
628 atop:[14] bathroom stuff | |
627 merging shopping | 629 merging shopping |
628 | 630 |
629 The old version of bathroom is hidden again. | 631 The old version of bathroom is hidden again. |
630 | 632 |
631 $ hg log -G | 633 $ hg log -G |