Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-confused-revert @ 2214:6c6c0e5595a2
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 | 7544700fd931 |
children | e506c14382fd |
line wrap: on
line diff
--- a/tests/test-confused-revert +++ b/tests/test-confused-revert @@ -41,9 +41,12 @@ hg remove a echo "%%% should show a removed and b added" hg status -echo "reverting..." +echo "%%% revert should fail" hg revert +echo "%%% revert should be ok now" +hg revert -r2 + echo "%%% should show b unknown and a marked modified (merged)" hg status