Mercurial > hg
diff tests/test-mq-qnew.out @ 10114:3e7663b2f3fc stable
mq: qnew -f should reject merge working directories
author | timeless <timeless@mozdev.org> |
---|---|
date | Wed, 23 Dec 2009 13:09:11 +0100 |
parents | f16ec85f125c |
children | 27d542bc0f5b |
line wrap: on
line diff
--- a/tests/test-mq-qnew.out Tue Dec 22 00:50:03 2009 +0100 +++ b/tests/test-mq-qnew.out Wed Dec 23 13:09:11 2009 +0100 @@ -35,3 +35,13 @@ % qnew -u with no username configured From: blue +% fail when trying to import a merge +adding a +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head +merging a +warning: conflicts during merge. +merging a failed! +0 files updated, 0 files merged, 0 files removed, 1 files unresolved +use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon +abort: cannot manage merge changesets