Mercurial > hg
comparison tests/test-mq-header-from.t @ 23344:6333412245ec stable
mq: when setting message in plain mode, separate it from header (issue4453)
Fix inconsistent handling of plain header separation in mq patcheader - and
contrary to c87f2a5a6e49, do it in the direction of having an empty line
between header and description. Plain patches are like mails and should thus
have an empty line between headers and body in compliance with RFC 822 3.1.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Sun, 16 Nov 2014 19:57:40 +0100 |
parents | aac5482db318 |
children | 5ccced6eab0b |
comparison
equal
deleted
inserted
replaced
23265:3246801ff313 | 23344:6333412245ec |
---|---|
174 +2 | 174 +2 |
175 1: [mq]: 2.patch - jane | 175 1: [mq]: 2.patch - jane |
176 0: [mq]: 1.patch - mary | 176 0: [mq]: 1.patch - mary |
177 ==== qnew -U -m | 177 ==== qnew -U -m |
178 From: test | 178 From: test |
179 | |
179 Three | 180 Three |
180 | 181 |
181 2: Three - test | 182 2: Three - test |
182 1: [mq]: 2.patch - jane | 183 1: [mq]: 2.patch - jane |
183 0: [mq]: 1.patch - mary | 184 0: [mq]: 1.patch - mary |
184 ==== qref | 185 ==== qref |
185 adding 3 | 186 adding 3 |
186 From: test | 187 From: test |
188 | |
187 Three | 189 Three |
188 | 190 |
189 diff -r ... 3 | 191 diff -r ... 3 |
190 --- /dev/null | 192 --- /dev/null |
191 +++ b/3 | 193 +++ b/3 |
194 2: Three - test | 196 2: Three - test |
195 1: [mq]: 2.patch - jane | 197 1: [mq]: 2.patch - jane |
196 0: [mq]: 1.patch - mary | 198 0: [mq]: 1.patch - mary |
197 ==== qref -m | 199 ==== qref -m |
198 From: test | 200 From: test |
201 | |
199 Drei | 202 Drei |
200 | 203 |
201 diff -r ... 3 | 204 diff -r ... 3 |
202 --- /dev/null | 205 --- /dev/null |
203 +++ b/3 | 206 +++ b/3 |
206 2: Drei - test | 209 2: Drei - test |
207 1: [mq]: 2.patch - jane | 210 1: [mq]: 2.patch - jane |
208 0: [mq]: 1.patch - mary | 211 0: [mq]: 1.patch - mary |
209 ==== qref -u | 212 ==== qref -u |
210 From: mary | 213 From: mary |
214 | |
211 Drei | 215 Drei |
212 | 216 |
213 diff -r ... 3 | 217 diff -r ... 3 |
214 --- /dev/null | 218 --- /dev/null |
215 +++ b/3 | 219 +++ b/3 |
218 2: Drei - mary | 222 2: Drei - mary |
219 1: [mq]: 2.patch - jane | 223 1: [mq]: 2.patch - jane |
220 0: [mq]: 1.patch - mary | 224 0: [mq]: 1.patch - mary |
221 ==== qref -u -m | 225 ==== qref -u -m |
222 From: maria | 226 From: maria |
227 | |
223 Three (again) | 228 Three (again) |
224 | 229 |
225 diff -r ... 3 | 230 diff -r ... 3 |
226 --- /dev/null | 231 --- /dev/null |
227 +++ b/3 | 232 +++ b/3 |