tests/test-mq-qimport.out
author Matt Mackall <mpm@selenic.com>
Sun, 15 Feb 2009 10:50:48 -0600
changeset 7768 5bf5fd1e2a74
parent 7627 fb32ae9c76e7
child 8362 bbc74c05b8a4
permissions -rw-r--r--
merge: mark kept local files as readded on linear update (issue539)

% 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