Mercurial > evolve
diff tests/test-uncommit.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 | 979a8ea17e1e abe6dfbdc744 |
line wrap: on
line diff
--- a/tests/test-uncommit.t Fri Apr 28 15:29:32 2017 +0200 +++ b/tests/test-uncommit.t Fri Apr 28 16:57:41 2017 +0200 @@ -239,8 +239,8 @@ $ hg up -C 3 --hidden 8 files updated, 0 files merged, 1 files removed, 0 files unresolved (leaving bookmark touncommit-bm) - working directory parent is obsolete! - (use 'hg evolve' to update to its successor) + working directory parent is obsolete! (5eb72dbe0cb4) + (use 'hg evolve' to update to its successor: e8db4aa611f6) $ hg --config extensions.purge= purge $ hg uncommit -I 'set:added() and e' 2 new divergent changesets @@ -285,8 +285,8 @@ $ hg up -C 3 --hidden 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! (5eb72dbe0cb4) + (5eb72dbe0cb4 has diverged, use 'hg evolve -list --divergent' to resolve the issue) $ hg --config extensions.purge= purge $ hg uncommit --all -X e 1 new divergent changesets