Mercurial > evolve
comparison tests/test-obsolete.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 | 64c6bdfd0518 |
comparison
equal
deleted
inserted
replaced
| 749:f728edc7fcd1 | 750:ddbea2fdee5e |
|---|---|
| 661 parent: 11:9468a5f5d8b2 | 661 parent: 11:9468a5f5d8b2 |
| 662 user: test | 662 user: test |
| 663 date: Thu Jan 01 00:00:00 1970 +0000 | 663 date: Thu Jan 01 00:00:00 1970 +0000 |
| 664 summary: add obsolet_conflicting_d | 664 summary: add obsolet_conflicting_d |
| 665 | 665 |
| 666 | |
| 667 $ hg up --hidden 3 -q | |
| 668 working directory parent is obsolete! | |
| 669 $ hg evolve | |
| 670 parent is obsolete with multiple successors: | |
| 671 [4] add obsol_c' | |
| 672 [10] add obsol_c | |
| 673 [2] | |
| 674 $ hg olog | |
| 675 changeset: 2:4538525df7e2 | |
| 676 user: test | |
| 677 date: Thu Jan 01 00:00:00 1970 +0000 | |
| 678 summary: add c | |
| 679 |