Mercurial > evolve
diff 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 |
line wrap: on
line diff
--- a/tests/test-obsolete.t Wed Jul 31 19:56:28 2013 +0200 +++ b/tests/test-obsolete.t Tue Oct 22 11:51:01 2013 +0200 @@ -663,3 +663,17 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: add obsolet_conflicting_d + + $ hg up --hidden 3 -q + working directory parent is obsolete! + $ hg evolve + parent is obsolete with multiple successors: + [4] add obsol_c' + [10] add obsol_c + [2] + $ hg olog + changeset: 2:4538525df7e2 + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: add c +