Mercurial > evolve
diff tests/test-evolve.t @ 468:6b1b6d338478
stabilize: rework stabilize code to allow selection of latecomer and conflicting
They are still unhandled but the tool now explicitly state this fact.
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Mon, 20 Aug 2012 18:59:07 +0200 |
| parents | 9d47474d2582 |
| children | abeb17a9e313 |
line wrap: on
line diff
--- a/tests/test-evolve.t Mon Aug 20 15:43:57 2012 +0200 +++ b/tests/test-evolve.t Mon Aug 20 18:59:07 2012 +0200 @@ -287,6 +287,30 @@ $ hg phase --public 7 1 new latecomers changesets +all solving latecomer troubled + + $ hg glog + @ 8 feature-B: another feature that rox - test + | + | o 7 : another feature - test + |/ + o 6 feature-A: a nifty feature - test + | + o 0 : base - test + + $ hg stabilize --any + latecomer not handled yet + [4] + $ hg glog + @ 8 feature-B: another feature that rox - test + | + | o 7 : another feature - test + |/ + o 6 feature-A: a nifty feature - test + | + o 0 : base - test + + $ cd .. enable general delta