##// END OF EJS Templates
diffstat: don't fail on merges...
diffstat: don't fail on merges First version by Alexander Solovyov <piranha@piranha.org.ua>

File last commit:

r7627:fb32ae9c default
r7664:3cc74ee7 default
Show More
test-mq-qimport.out
24 lines | 543 B | text/plain | TextLexer
/ tests / test-mq-qimport.out
Martin Geisler
qimport: report filename in case of IOError...
r6940 % qimport non-existing-file
Benoit Boissinot
Catch both IOError and OSError, fix regression introduced by 8046f0a070a6
r7421 abort: unable to read non-existing-file
Brendan Cully
mq: let qimport read patches from URLs
r7158 % import URL
adding url.diff to series file
url.diff
Brendan Cully
mq: make qimport -f work properly. Closes issue1255....
r7160 % import patch that already exists
abort: patch "url.diff" already exists
applying url.diff
Martin Geisler
mq: lowercase output...
r7627 now at: url.diff
Brendan Cully
mq: make qimport -f work properly. Closes issue1255....
r7160 foo
Martin Geisler
mq: lowercase output...
r7627 patch queue now empty
Brendan Cully
mq: make qimport -f work properly. Closes issue1255....
r7160 % qimport -f
adding url.diff to series file
applying url.diff
Martin Geisler
mq: lowercase output...
r7627 now at: url.diff
Brendan Cully
mq: make qimport -f work properly. Closes issue1255....
r7160 foo2
Martin Geisler
mq: lowercase output...
r7627 patch queue now empty
Patrick Mezard
mq: qimport must read patches in binary mode
r6027 % 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
Martin Geisler
mq: lowercase output...
r7627 now at: b.diff