tests/test-mq-qimport.out
author Mads Kiilerich <mads@kiilerich.com>
Sun, 21 Jun 2009 03:11:52 +0200
changeset 8901 94319ae527cf
parent 8832 6e6f5b80e056
child 9110 561ff8d9e4f0
child 9287 53fdf18fd63b
permissions -rw-r--r--
test merge-tools internal:dump and internal:prompt

% 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
% try to import --push
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding another.diff to series file
applying another.diff
now at: another.diff
patch b.diff finalized without changeset message
patch another.diff finalized without changeset message