Mercurial > evolve
diff tests/test-stabilize-result.t @ 587:8152fedbac65 stable
evolve: smarter code for divergent changeset
This newer version properly handle split now. Code and test copied for future
upstream one.
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Tue, 23 Oct 2012 16:36:29 +0200 |
| parents | f01721161532 |
| children | 26f76b38f879 |
line wrap: on
line diff
--- a/tests/test-stabilize-result.t Tue Oct 23 15:44:24 2012 +0200 +++ b/tests/test-stabilize-result.t Tue Oct 23 16:36:29 2012 +0200 @@ -297,7 +297,10 @@ Working directory parent is obsolete $ echo 'gotta break' >> a $ hg amend - 1 new divergent changesets + 2 new divergent changesets + $ hg phase 'divergent()' + 22: draft + 24: draft $ hg evolve -qn hg update -c c956a4b140b6 && hg merge ac6d600735a4 &&