Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-confused-revert.out @ 2214:6c6c0e5595a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make test-confused-revert check working dir with two parents.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 05 May 2006 10:45:08 -0700
parents b2ae81a7df29
children 25857e00af8e
line wrap: on
line diff
--- a/tests/test-confused-revert.out
+++ b/tests/test-confused-revert.out
@@ -16,7 +16,9 @@ foo-b
 %%% should show a removed and b added
 A b
 R a
-reverting...
+%%% revert should fail
+abort: working dir has two parents; you must specify the revision to revert to
+%%% revert should be ok now
 undeleting a
 forgetting b
 %%% should show b unknown and a marked modified (merged)