| author | Matt Mackall <mpm@selenic.com> |
| Thu, 12 Aug 2010 18:09:03 -0500 | |
| changeset 11832 | 7fa36341e7a0 |
| parent 11714 | aae1dd12fce6 |
| permissions | -rw-r--r-- |
|
6940
05ec27530d04
qimport: report filename in case of IOError
Martin Geisler <mg@daimi.au.dk>
parents:
6027
diff
changeset
|
1 |
% qimport non-existing-file |
|
11709
3e561b6af810
mq: clarify the fact that qimport is trying to read a file
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11047
diff
changeset
|
2 |
abort: unable to read file non-existing-file |
|
9287
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
3 |
% import email |
|
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
4 |
adding email to series file |
|
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
5 |
applying email |
|
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
6 |
now at: email |
|
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
7 |
% hg tip -v |
|
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
8 |
changeset: 0:1a706973a7d8 |
|
11047
c7dbd6c4877a
tags: return tags in sorted order
Eric Eisner <ede@mit.edu>
parents:
9327
diff
changeset
|
9 |
tag: email |
|
c7dbd6c4877a
tags: return tags in sorted order
Eric Eisner <ede@mit.edu>
parents:
9327
diff
changeset
|
10 |
tag: qbase |
|
9287
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
11 |
tag: qtip |
|
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
12 |
tag: tip |
|
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
13 |
user: Username in patch <test@example.net> |
|
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
14 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
15 |
files: x |
|
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
16 |
description: |
|
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
17 |
First line of commit message. |
|
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
18 |
|
|
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
19 |
More text in commit message. |
|
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
20 |
|
|
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
21 |
|
| 9288 | 22 |
popping email |
|
9287
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
23 |
patch queue now empty |
|
7158
d1d011accf94
mq: let qimport read patches from URLs
Brendan Cully <brendan@kublai.com>
parents:
6940
diff
changeset
|
24 |
% import URL |
|
d1d011accf94
mq: let qimport read patches from URLs
Brendan Cully <brendan@kublai.com>
parents:
6940
diff
changeset
|
25 |
adding url.diff to series file |
|
d1d011accf94
mq: let qimport read patches from URLs
Brendan Cully <brendan@kublai.com>
parents:
6940
diff
changeset
|
26 |
url.diff |
|
7160
1b7b21b634f2
mq: make qimport -f work properly. Closes issue1255.
Brendan Cully <brendan@kublai.com>
parents:
7158
diff
changeset
|
27 |
% import patch that already exists |
|
1b7b21b634f2
mq: make qimport -f work properly. Closes issue1255.
Brendan Cully <brendan@kublai.com>
parents:
7158
diff
changeset
|
28 |
abort: patch "url.diff" already exists |
|
1b7b21b634f2
mq: make qimport -f work properly. Closes issue1255.
Brendan Cully <brendan@kublai.com>
parents:
7158
diff
changeset
|
29 |
applying url.diff |
| 7627 | 30 |
now at: url.diff |
|
7160
1b7b21b634f2
mq: make qimport -f work properly. Closes issue1255.
Brendan Cully <brendan@kublai.com>
parents:
7158
diff
changeset
|
31 |
foo |
|
9110
561ff8d9e4f0
mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents:
8832
diff
changeset
|
32 |
popping url.diff |
| 7627 | 33 |
patch queue now empty |
|
7160
1b7b21b634f2
mq: make qimport -f work properly. Closes issue1255.
Brendan Cully <brendan@kublai.com>
parents:
7158
diff
changeset
|
34 |
% qimport -f |
|
1b7b21b634f2
mq: make qimport -f work properly. Closes issue1255.
Brendan Cully <brendan@kublai.com>
parents:
7158
diff
changeset
|
35 |
adding url.diff to series file |
|
1b7b21b634f2
mq: make qimport -f work properly. Closes issue1255.
Brendan Cully <brendan@kublai.com>
parents:
7158
diff
changeset
|
36 |
applying url.diff |
| 7627 | 37 |
now at: url.diff |
|
7160
1b7b21b634f2
mq: make qimport -f work properly. Closes issue1255.
Brendan Cully <brendan@kublai.com>
parents:
7158
diff
changeset
|
38 |
foo2 |
|
9110
561ff8d9e4f0
mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents:
8832
diff
changeset
|
39 |
popping url.diff |
| 7627 | 40 |
patch queue now empty |
|
6027
cee68264ed92
mq: qimport must read patches in binary mode
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
41 |
% build diff with CRLF |
|
cee68264ed92
mq: qimport must read patches in binary mode
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
42 |
adding b |
|
cee68264ed92
mq: qimport must read patches in binary mode
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
43 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
cee68264ed92
mq: qimport must read patches in binary mode
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
44 |
% qimport CRLF diff |
|
cee68264ed92
mq: qimport must read patches in binary mode
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
45 |
adding b.diff to series file |
|
cee68264ed92
mq: qimport must read patches in binary mode
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
46 |
applying b.diff |
| 7627 | 47 |
now at: b.diff |
|
8362
bbc74c05b8a4
mq: add -P/--push option to qimport
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7627
diff
changeset
|
48 |
% try to import --push |
|
bbc74c05b8a4
mq: add -P/--push option to qimport
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7627
diff
changeset
|
49 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
bbc74c05b8a4
mq: add -P/--push option to qimport
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7627
diff
changeset
|
50 |
adding another.diff to series file |
|
bbc74c05b8a4
mq: add -P/--push option to qimport
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7627
diff
changeset
|
51 |
applying another.diff |
|
bbc74c05b8a4
mq: add -P/--push option to qimport
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7627
diff
changeset
|
52 |
now at: another.diff |
|
8832
6e6f5b80e056
mq: warn about finalizing patches without cset message
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8362
diff
changeset
|
53 |
patch b.diff finalized without changeset message |
|
6e6f5b80e056
mq: warn about finalizing patches without cset message
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8362
diff
changeset
|
54 |
patch another.diff finalized without changeset message |
|
11699
da0b9109186d
mq: support "qimport --existing --name renametothis thatexistingpatch"
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11047
diff
changeset
|
55 |
popping 2.diff |
|
da0b9109186d
mq: support "qimport --existing --name renametothis thatexistingpatch"
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11047
diff
changeset
|
56 |
patch queue now empty |
|
da0b9109186d
mq: support "qimport --existing --name renametothis thatexistingpatch"
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11047
diff
changeset
|
57 |
% qimport -e |
|
da0b9109186d
mq: support "qimport --existing --name renametothis thatexistingpatch"
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11047
diff
changeset
|
58 |
adding 2.diff to series file |
|
da0b9109186d
mq: support "qimport --existing --name renametothis thatexistingpatch"
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11047
diff
changeset
|
59 |
% qimport -e --name newname oldexisitingpatch |
|
da0b9109186d
mq: support "qimport --existing --name renametothis thatexistingpatch"
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11047
diff
changeset
|
60 |
renaming 2.diff to this-name-is-better |
|
da0b9109186d
mq: support "qimport --existing --name renametothis thatexistingpatch"
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11047
diff
changeset
|
61 |
adding this-name-is-better to series file |
|
da0b9109186d
mq: support "qimport --existing --name renametothis thatexistingpatch"
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11047
diff
changeset
|
62 |
this-name-is-better |
|
da0b9109186d
mq: support "qimport --existing --name renametothis thatexistingpatch"
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11047
diff
changeset
|
63 |
url.diff |
|
11701
84fb29f5e0d2
mq: fix qimport --name --existing --force on win32
Patrick Mezard <pmezard@gmail.com>
parents:
11699
diff
changeset
|
64 |
% qimport -e --name without --force |
|
84fb29f5e0d2
mq: fix qimport --name --existing --force on win32
Patrick Mezard <pmezard@gmail.com>
parents:
11699
diff
changeset
|
65 |
abort: patch "this-name-is-better" already exists |
|
84fb29f5e0d2
mq: fix qimport --name --existing --force on win32
Patrick Mezard <pmezard@gmail.com>
parents:
11699
diff
changeset
|
66 |
this-name-is-better |
|
84fb29f5e0d2
mq: fix qimport --name --existing --force on win32
Patrick Mezard <pmezard@gmail.com>
parents:
11699
diff
changeset
|
67 |
url.diff |
|
84fb29f5e0d2
mq: fix qimport --name --existing --force on win32
Patrick Mezard <pmezard@gmail.com>
parents:
11699
diff
changeset
|
68 |
% qimport -e --name with --force |
|
84fb29f5e0d2
mq: fix qimport --name --existing --force on win32
Patrick Mezard <pmezard@gmail.com>
parents:
11699
diff
changeset
|
69 |
renaming 3.diff to this-name-is-better |
|
84fb29f5e0d2
mq: fix qimport --name --existing --force on win32
Patrick Mezard <pmezard@gmail.com>
parents:
11699
diff
changeset
|
70 |
adding this-name-is-better to series file |
|
84fb29f5e0d2
mq: fix qimport --name --existing --force on win32
Patrick Mezard <pmezard@gmail.com>
parents:
11699
diff
changeset
|
71 |
this-name-is-better |
|
84fb29f5e0d2
mq: fix qimport --name --existing --force on win32
Patrick Mezard <pmezard@gmail.com>
parents:
11699
diff
changeset
|
72 |
url.diff |