Mercurial > hg
view tests/test-mq-qimport.out @ 7821:9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Fixes issue1533.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Wed, 04 Mar 2009 13:06:16 -0600 |
parents | fb32ae9c76e7 |
children | bbc74c05b8a4 |
line wrap: on
line source
% qimport non-existing-file abort: unable to read non-existing-file % import URL adding url.diff to series file url.diff % import patch that already exists abort: patch "url.diff" already exists applying url.diff now at: url.diff foo patch queue now empty % qimport -f adding url.diff to series file applying url.diff now at: url.diff foo2 patch queue now empty % build diff with CRLF adding b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % qimport CRLF diff adding b.diff to series file applying b.diff now at: b.diff