Mercurial > hg
view tests/test-mq-qimport.out @ 7518:dd66d161a14b
merge with -stable
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Sat, 13 Dec 2008 13:28:20 +0100 |
| parents | 4c4324476be6 |
| children | fb32ae9c76e7 |
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