Mercurial > evolve
diff tests/test-stabilize-result.t @ 2289:61d073590fb7
ui: add better messages when the working copy become obsolete.
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Fri, 28 Apr 2017 16:57:41 +0200 |
| parents | 9f42f819267b |
| children | ee321b87c548 5506b463bddc |
line wrap: on
line diff
--- a/tests/test-stabilize-result.t Fri Apr 28 15:29:32 2017 +0200 +++ b/tests/test-stabilize-result.t Fri Apr 28 16:57:41 2017 +0200 @@ -222,8 +222,8 @@ $ hg amend $ 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) + working directory parent is obsolete! (3932c176bbaa) + (use 'hg evolve' to update to its successor: d2f173e25686) $ mv a a.old $ echo 'jungle' > a $ cat a.old >> a @@ -335,8 +335,8 @@ $ 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) + working directory parent is obsolete! (3932c176bbaa) + (use 'hg evolve' to update to its successor: f344982e63c4) $ echo 'gotta break' >> a $ hg amend 2 new divergent changesets