test-mq-qimport.out
72 lines
| 1.7 KiB
| text/plain
|
TextLexer
/ tests / test-mq-qimport.out
|
r6940 | % qimport non-existing-file | ||
|
r7421 | abort: unable to read non-existing-file | ||
|
r9287 | % import email | ||
adding email to series file | ||||
applying email | ||||
now at: email | ||||
% hg tip -v | ||||
changeset: 0:1a706973a7d8 | ||||
|
r11047 | tag: email | ||
tag: qbase | ||||
|
r9287 | tag: qtip | ||
tag: tip | ||||
user: Username in patch <test@example.net> | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
files: x | ||||
description: | ||||
First line of commit message. | ||||
More text in commit message. | ||||
|
r9288 | popping email | ||
|
r9287 | patch queue now empty | ||
|
r7158 | % import URL | ||
adding url.diff to series file | ||||
url.diff | ||||
|
r7160 | % import patch that already exists | ||
abort: patch "url.diff" already exists | ||||
applying url.diff | ||||
|
r7627 | now at: url.diff | ||
|
r7160 | foo | ||
|
r9110 | popping url.diff | ||
|
r7627 | patch queue now empty | ||
|
r7160 | % qimport -f | ||
adding url.diff to series file | ||||
applying url.diff | ||||
|
r7627 | now at: url.diff | ||
|
r7160 | foo2 | ||
|
r9110 | popping url.diff | ||
|
r7627 | patch queue now empty | ||
|
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 | ||||
|
r7627 | now at: b.diff | ||
|
r8362 | % 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 | ||||
|
r8832 | patch b.diff finalized without changeset message | ||
patch another.diff finalized without changeset message | ||||
|
r11699 | popping 2.diff | ||
patch queue now empty | ||||
% qimport -e | ||||
adding 2.diff to series file | ||||
% qimport -e --name newname oldexisitingpatch | ||||
renaming 2.diff to this-name-is-better | ||||
adding this-name-is-better to series file | ||||
this-name-is-better | ||||
url.diff | ||||
|
r11701 | % qimport -e --name without --force | ||
abort: patch "this-name-is-better" already exists | ||||
this-name-is-better | ||||
url.diff | ||||
% qimport -e --name with --force | ||||
renaming 3.diff to this-name-is-better | ||||
adding this-name-is-better to series file | ||||
this-name-is-better | ||||
url.diff | ||||