Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
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.
authorVadim Gelfer <vadim.gelfer@gmail.com>
Fri, 05 May 2006 10:45:08 -0700
changeset 2214 6c6c0e5595a2
parent 2213 6f76a479ae51
child 2215 afc9a3a43013
make test-confused-revert check working dir with two parents.
tests/test-confused-revert file | annotate | diff | comparison | revisions
tests/test-confused-revert.out file | annotate | diff | comparison | revisions 
--- 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)
Mercurial