##// END OF EJS Templates
Merge with stable
Merge with stable

File last commit:

r9327:9a69ab6d merge default
r10276:6109a02c merge default
Show More
test-mq-qimport.out
54 lines | 1.2 KiB | text/plain | TextLexer
% qimport non-existing-file
abort: unable to read non-existing-file
% import email
adding email to series file
applying email
now at: email
% hg tip -v
changeset: 0:1a706973a7d8
tag: qtip
tag: tip
tag: email
tag: qbase
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.
popping email
patch queue now empty
% 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
popping url.diff
patch queue now empty
% qimport -f
adding url.diff to series file
applying url.diff
now at: url.diff
foo2
popping url.diff
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