diff tests/test-commit @ 6386:bae2e9c838e9 1.0

Tests for issue 1049

--- a/tests/test-commit	Mon Mar 24 15:36:56 2008 -0700
+++ b/tests/test-commit	Mon Mar 24 15:50:58 2008 -0700
@@ -85,4 +85,22 @@
 cd ..
 cd ..
 
+cd ..
+hg init issue1049
+cd issue1049
+echo a > a
+hg ci -Ama
+echo a >> a
+hg ci -mb
+hg up 0
+echo b >> a
+hg ci -mc
+HGMERGE=true hg merge
+echo % should fail because we are specifying a file name
+hg ci -mmerge a
+echo % should fail because we are specifying a pattern
+hg ci -mmerge -I a
+echo % should succeed
+hg ci -mmerge
+
 exit 0