comparison tests/test-patchbomb.out @ 4565:8b87bd4fb7ce

Correct tests/test-patchbomb* files: mv test-patchbomb test-patchbomb.out hg revert -r 1cf908c00479 test-patchbomb
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 13 Jun 2007 08:24:40 +0200
parents 1cf908c00479
children ec431334e4fc
comparison
equal deleted inserted replaced
4564:087b3ae4f08a 4565:8b87bd4fb7ce
1 adding a 1 adding a
2 hg email: option --date not recognized 2 Content-Type: text/plain; charset="us-ascii"
3 hg email [OPTION]... [DEST]... 3 MIME-Version: 1.0
4 Content-Transfer-Encoding: 7bit
5 Subject: [PATCH] a
6 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
7 Message-Id: <8580ff50825a50c8f716.60@
8 Date: Thu, 01 Jan 1970 00:01:00 +0000
9 From: quux
10 To: foo
11 Cc: bar
4 12
5 send changesets by email 13 # HG changeset patch
14 # User test
15 # Date 1 0
16 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
17 # Parent 0000000000000000000000000000000000000000
18 a
6 19
7 By default, diffs are sent in the format generated by hg export, 20 diff -r 000000000000 -r 8580ff50825a a
8 one per message. The series starts with a "[PATCH 0 of N]" 21 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
9 introduction, which describes the series as a whole. 22 +++ b/a Thu Jan 01 00:00:01 1970 +0000
23 @@ -0,0 +1,1 @@
24 +a
10 25
11 Each patch email has a Subject line of "[PATCH M of N] ...", using 26 This patch series consists of 1 patches.
12 the first line of the changeset description as the subject text.
13 The message contains two or three body parts. First, the rest of
14 the changeset description. Next, (optionally) if the diffstat
15 program is installed, the result of running diffstat on the patch.
16 Finally, the patch itself, as generated by "hg export".
17 27
18 With --outgoing, emails will be generated for patches not
19 found in the destination repository (or only those which are
20 ancestors of the specified revisions if any are provided)
21 28
22 With --bundle, changesets are selected as for --outgoing, 29 Displaying [PATCH] a ...
23 but a single email containing a binary Mercurial bundle as an 30 adding b
24 attachment will be sent. 31 Content-Type: text/plain; charset="us-ascii"
32 MIME-Version: 1.0
33 Content-Transfer-Encoding: 7bit
34 Subject: [PATCH 0 of 2] test
35 Message-Id: <patchbomb.120@
36 Date: Thu, 01 Jan 1970 00:02:00 +0000
37 From: quux
38 To: foo
39 Cc: bar
25 40
26 Examples:
27 41
28 hg email -r 3000 # send patch 3000 only 42 Content-Type: text/plain; charset="us-ascii"
29 hg email -r 3000 -r 3001 # send patches 3000 and 3001 43 MIME-Version: 1.0
30 hg email -r 3000:3005 # send patches 3000 through 3005 44 Content-Transfer-Encoding: 7bit
31 hg email 3000 # send patch 3000 (deprecated) 45 Subject: [PATCH 1 of 2] a
46 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
47 Message-Id: <8580ff50825a50c8f716.121@
48 In-Reply-To: <patchbomb.120@
49 Date: Thu, 01 Jan 1970 00:02:01 +0000
50 From: quux
51 To: foo
52 Cc: bar
32 53
33 hg email -o # send all patches not in default 54 # HG changeset patch
34 hg email -o DEST # send all patches not in DEST 55 # User test
35 hg email -o -r 3000 # send all ancestors of 3000 not in default 56 # Date 1 0
36 hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST 57 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
58 # Parent 0000000000000000000000000000000000000000
59 a
37 60
38 hg email -b # send bundle of all patches not in default 61 diff -r 000000000000 -r 8580ff50825a a
39 hg email -b DEST # send bundle of all patches not in DEST 62 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
40 hg email -b -r 3000 # bundle of all ancestors of 3000 not in default 63 +++ b/a Thu Jan 01 00:00:01 1970 +0000
41 hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST 64 @@ -0,0 +1,1 @@
65 +a
42 66
43 Before using this command, you will need to enable email in your hgrc. 67 Content-Type: text/plain; charset="us-ascii"
44 See the [email] section in hgrc(5) for details. 68 MIME-Version: 1.0
69 Content-Transfer-Encoding: 7bit
70 Subject: [PATCH 2 of 2] b
71 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
72 Message-Id: <97d72e5f12c7e84f8506.122@
73 In-Reply-To: <patchbomb.120@
74 Date: Thu, 01 Jan 1970 00:02:02 +0000
75 From: quux
76 To: foo
77 Cc: bar
45 78
46 options: 79 # HG changeset patch
80 # User test
81 # Date 2 0
82 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
83 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
84 b
47 85
48 -a --attach send patches as inline attachments 86 diff -r 8580ff50825a -r 97d72e5f12c7 b
49 --bcc email addresses of blind copy recipients 87 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
50 -c --cc email addresses of copy recipients 88 +++ b/b Thu Jan 01 00:00:02 1970 +0000
51 -d --diffstat add diffstat output to messages 89 @@ -0,0 +1,1 @@
52 -g --git use git extended diff format 90 +b
53 -f --from email address of sender
54 --plain omit hg patch header
55 -n --test print messages that would be sent
56 -m --mbox write messages to mbox file instead of sending them
57 -o --outgoing send changes not found in the target repository
58 -b --bundle send changes not in target as a binary bundle
59 -r --rev a revision to send
60 -s --subject subject of first message (intro or single patch)
61 -t --to email addresses of recipients
62 --force run even when remote repository is unrelated (with -b)
63 --base a base changeset to specify instead of a destination (with -b)
64 -e --ssh specify ssh command to use
65 --remotecmd specify hg command to run on the remote side
66 91
67 use "hg -v help email" to show global options 92 This patch series consists of 2 patches.
68 adding b
69 hg email: option --date not recognized
70 hg email [OPTION]... [DEST]...
71 93
72 send changesets by email
73 94
74 By default, diffs are sent in the format generated by hg export, 95 Write the introductory message for the patch series.
75 one per message. The series starts with a "[PATCH 0 of N]"
76 introduction, which describes the series as a whole.
77 96
78 Each patch email has a Subject line of "[PATCH M of N] ...", using
79 the first line of the changeset description as the subject text.
80 The message contains two or three body parts. First, the rest of
81 the changeset description. Next, (optionally) if the diffstat
82 program is installed, the result of running diffstat on the patch.
83 Finally, the patch itself, as generated by "hg export".
84 97
85 With --outgoing, emails will be generated for patches not 98 Displaying [PATCH 0 of 2] test ...
86 found in the destination repository (or only those which are 99 Displaying [PATCH 1 of 2] a ...
87 ancestors of the specified revisions if any are provided) 100 Displaying [PATCH 2 of 2] b ...
88
89 With --bundle, changesets are selected as for --outgoing,
90 but a single email containing a binary Mercurial bundle as an
91 attachment will be sent.
92
93 Examples:
94
95 hg email -r 3000 # send patch 3000 only
96 hg email -r 3000 -r 3001 # send patches 3000 and 3001
97 hg email -r 3000:3005 # send patches 3000 through 3005
98 hg email 3000 # send patch 3000 (deprecated)
99
100 hg email -o # send all patches not in default
101 hg email -o DEST # send all patches not in DEST
102 hg email -o -r 3000 # send all ancestors of 3000 not in default
103 hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST
104
105 hg email -b # send bundle of all patches not in default
106 hg email -b DEST # send bundle of all patches not in DEST
107 hg email -b -r 3000 # bundle of all ancestors of 3000 not in default
108 hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST
109
110 Before using this command, you will need to enable email in your hgrc.
111 See the [email] section in hgrc(5) for details.
112
113 options:
114
115 -a --attach send patches as inline attachments
116 --bcc email addresses of blind copy recipients
117 -c --cc email addresses of copy recipients
118 -d --diffstat add diffstat output to messages
119 -g --git use git extended diff format
120 -f --from email address of sender
121 --plain omit hg patch header
122 -n --test print messages that would be sent
123 -m --mbox write messages to mbox file instead of sending them
124 -o --outgoing send changes not found in the target repository
125 -b --bundle send changes not in target as a binary bundle
126 -r --rev a revision to send
127 -s --subject subject of first message (intro or single patch)
128 -t --to email addresses of recipients
129 --force run even when remote repository is unrelated (with -b)
130 --base a base changeset to specify instead of a destination (with -b)
131 -e --ssh specify ssh command to use
132 --remotecmd specify hg command to run on the remote side
133
134 use "hg -v help email" to show global options
135 This patch series consists of 2 patches. 101 This patch series consists of 2 patches.
136 102
137 103
138 Write the introductory message for the patch series. 104 Write the introductory message for the patch series.
139 105