Mercurial > hg-stable
changeset 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 | 6f76a479ae51 |
| children | afc9a3a43013 |
| files | tests/test-confused-revert tests/test-confused-revert.out |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-confused-revert Fri May 05 10:41:38 2006 -0700 +++ b/tests/test-confused-revert Fri May 05 10:45:08 2006 -0700 @@ -41,9 +41,12 @@ 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
--- a/tests/test-confused-revert.out Fri May 05 10:41:38 2006 -0700 +++ b/tests/test-confused-revert.out Fri May 05 10:45:08 2006 -0700 @@ -16,7 +16,9 @@ %%% 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)