Mercurial > hg
changeset 6386:bae2e9c838e9 1.0
Tests for issue 1049
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Mon, 24 Mar 2008 15:50:58 -0700 |
| parents | 0d4e068e9e52 |
| children | cfa08c88a5c4 |
| files | tests/test-commit tests/test-commit.out |
| diffstat | 2 files changed, 29 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- a/tests/test-commit.out Mon Mar 24 15:36:56 2008 -0700 +++ b/tests/test-commit.out Mon Mar 24 15:50:58 2008 -0700 @@ -92,3 +92,14 @@ 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