Mercurial > evolve
comparison tests/test-tutorial.t @ 750:ddbea2fdee5e
evolve: allow updating to the successor if the parent is obsolete
Although 'hg update' handles this as well, it will also update to
tipmost descendent of the successor, if any.
| author | Dan Villiom Podlaski Christiansen <dan@cabo.dk> |
|---|---|
| date | Tue, 22 Oct 2013 11:51:01 +0200 |
| parents | 9300f48786de |
| children | 32936a9f4389 |
comparison
equal
deleted
inserted
replaced
| 749:f728edc7fcd1 | 750:ddbea2fdee5e |
|---|---|
| 671 pulling from $TESTTMP/local | 671 pulling from $TESTTMP/local |
| 672 searching for changes | 672 searching for changes |
| 673 no changes found | 673 no changes found |
| 674 working directory parent is obsolete! | 674 working directory parent is obsolete! |
| 675 | 675 |
| 676 $ hg up ee942144f952 | 676 now let's see where we are, and update to the successor |
| 677 | |
| 678 $ hg parents | |
| 679 bf1b0d202029 (draft): animals | |
| 680 working directory parent is obsolete! | |
| 681 $ hg evolve | |
| 682 update:[8] animals | |
| 677 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 683 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 678 | 684 |
| 679 Relocating unstable change after prune | 685 Relocating unstable change after prune |
| 680 ---------------------------------------------- | 686 ---------------------------------------------- |
| 681 | 687 |