##// END OF EJS Templates
merge crew and main
merge crew and main

File last commit:

r11709:3e561b6a stable
r11711:a2d45964 merge default
Show More
test-mq-qimport.out
72 lines | 1.7 KiB | text/plain | TextLexer
/ tests / test-mq-qimport.out
Martin Geisler
qimport: report filename in case of IOError...
r6940 % qimport non-existing-file
Benoit Boissinot
Catch both IOError and OSError, fix regression introduced by 8046f0a070a6
r7421 abort: unable to read non-existing-file
David Soria Parra
mq: Parse commit message after we find start of changeset patch...
r9287 % import email
adding email to series file
applying email
now at: email
% hg tip -v
changeset: 0:1a706973a7d8
Eric Eisner
tags: return tags in sorted order...
r11047 tag: email
tag: qbase
David Soria Parra
mq: Parse commit message after we find start of changeset patch...
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.
Martin Geisler
Merge with crew-stable
r9288 popping email
David Soria Parra
mq: Parse commit message after we find start of changeset patch...
r9287 patch queue now empty
Brendan Cully
mq: let qimport read patches from URLs
r7158 % import URL
adding url.diff to series file
url.diff
Brendan Cully
mq: make qimport -f work properly. Closes issue1255....
r7160 % import patch that already exists
abort: patch "url.diff" already exists
applying url.diff
Martin Geisler
mq: lowercase output...
r7627 now at: url.diff
Brendan Cully
mq: make qimport -f work properly. Closes issue1255....
r7160 foo
Mads Kiilerich
mq: qpop now tells which patches are popped...
r9110 popping url.diff
Martin Geisler
mq: lowercase output...
r7627 patch queue now empty
Brendan Cully
mq: make qimport -f work properly. Closes issue1255....
r7160 % qimport -f
adding url.diff to series file
applying url.diff
Martin Geisler
mq: lowercase output...
r7627 now at: url.diff
Brendan Cully
mq: make qimport -f work properly. Closes issue1255....
r7160 foo2
Mads Kiilerich
mq: qpop now tells which patches are popped...
r9110 popping url.diff
Martin Geisler
mq: lowercase output...
r7627 patch queue now empty
Patrick Mezard
mq: qimport must read patches in binary mode
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
Martin Geisler
mq: lowercase output...
r7627 now at: b.diff
Dirkjan Ochtman
mq: add -P/--push option to qimport
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
Dirkjan Ochtman
mq: warn about finalizing patches without cset message
r8832 patch b.diff finalized without changeset message
patch another.diff finalized without changeset message
Nicolas Dumazet
mq: support "qimport --existing --name renametothis thatexistingpatch"...
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
Patrick Mezard
mq: fix qimport --name --existing --force on win32...
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