equal
deleted
inserted
replaced
4 adding url.diff to series file |
4 adding url.diff to series file |
5 url.diff |
5 url.diff |
6 % import patch that already exists |
6 % import patch that already exists |
7 abort: patch "url.diff" already exists |
7 abort: patch "url.diff" already exists |
8 applying url.diff |
8 applying url.diff |
9 Now at: url.diff |
9 now at: url.diff |
10 foo |
10 foo |
11 Patch queue now empty |
11 patch queue now empty |
12 % qimport -f |
12 % qimport -f |
13 adding url.diff to series file |
13 adding url.diff to series file |
14 applying url.diff |
14 applying url.diff |
15 Now at: url.diff |
15 now at: url.diff |
16 foo2 |
16 foo2 |
17 Patch queue now empty |
17 patch queue now empty |
18 % build diff with CRLF |
18 % build diff with CRLF |
19 adding b |
19 adding b |
20 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
20 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21 % qimport CRLF diff |
21 % qimport CRLF diff |
22 adding b.diff to series file |
22 adding b.diff to series file |
23 applying b.diff |
23 applying b.diff |
24 Now at: b.diff |
24 now at: b.diff |