diff -r 6a219f8089f9 -r 6c122c975125 tests/test-stabilize-result.t --- a/tests/test-stabilize-result.t Tue Jun 23 18:16:21 2015 -0700 +++ b/tests/test-stabilize-result.t Wed Jun 24 16:37:02 2015 -0700 @@ -224,6 +224,7 @@ $ hg up --hidden 15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! + (use "hg evolve" to update to its successor) $ mv a a.old $ echo 'jungle' > a $ cat a.old >> a @@ -336,6 +337,7 @@ $ hg up --hidden 15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! + (use "hg evolve" to update to its successor) $ echo 'gotta break' >> a $ hg amend 2 new divergent changesets