Mercurial > evolve
diff 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 |
line wrap: on
line diff
--- a/tests/test-tutorial.t Wed Jul 31 19:56:28 2013 +0200 +++ b/tests/test-tutorial.t Tue Oct 22 11:51:01 2013 +0200 @@ -673,7 +673,13 @@ no changes found working directory parent is obsolete! - $ hg up ee942144f952 +now let's see where we are, and update to the successor + + $ hg parents + bf1b0d202029 (draft): animals + working directory parent is obsolete! + $ hg evolve + update:[8] animals 1 files updated, 0 files merged, 0 files removed, 0 files unresolved Relocating unstable change after prune