Commits

Bryan O'Sullivan committed bae2e9c

Tests for issue 1049

  • Participants
  • Parent commits 0d4e068
  • Tags 1.0

Comments (0)

Files changed (2)

File tests/test-commit

 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

File tests/test-commit.out

 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     commit-foo-subdir
 
+adding a
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+created new head
+merging a
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+% should fail because we are specifying a file name
+abort: cannot partially commit a merge (do not specify files or patterns)
+% should fail because we are specifying a pattern
+abort: cannot partially commit a merge (do not specify files or patterns)
+% should succeed