branch | stable |
changeset 587 | 8152fedbac65 |
parent 586 | f01721161532 |
child 593 | 26f76b38f879 |
--- 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 &&