Show More
@@ -1,352 +1,349 b'' | |||
|
1 | $ "$TESTDIR/hghave" execbit || exit 80 | |
|
2 | ||
|
3 | 1 |
|
|
4 | 2 | |
|
5 | 3 | Setup: |
|
6 | 4 | |
|
7 | 5 | $ echo a >> a |
|
8 | 6 | $ hg ci -Am 'base' |
|
9 | 7 | adding a |
|
10 | 8 | |
|
11 | 9 | Refuse to amend public csets: |
|
12 | 10 | |
|
13 | 11 | $ hg phase -r . -p |
|
14 | 12 | $ hg ci --amend |
|
15 | 13 | abort: cannot amend public changesets |
|
16 | 14 | [255] |
|
17 | 15 | $ hg phase -r . -f -d |
|
18 | 16 | |
|
19 | 17 | $ echo a >> a |
|
20 | 18 | $ hg ci -Am 'base1' |
|
21 | 19 | |
|
22 | 20 | Nothing to amend: |
|
23 | 21 | |
|
24 | 22 | $ hg ci --amend |
|
25 | 23 | nothing changed |
|
26 | 24 | [1] |
|
27 | 25 | |
|
28 | 26 | Amending changeset with changes in working dir: |
|
29 | 27 | |
|
30 | 28 | $ echo a >> a |
|
31 | 29 | $ hg ci --amend -m 'amend base1' |
|
32 | 30 | saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-amend-backup.hg (glob) |
|
33 | 31 | $ hg diff -c . |
|
34 | 32 | diff -r ad120869acf0 -r 9cd25b479c51 a |
|
35 | 33 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
36 | 34 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
37 | 35 | @@ -1,1 +1,3 @@ |
|
38 | 36 | a |
|
39 | 37 | +a |
|
40 | 38 | +a |
|
41 | 39 | $ hg log |
|
42 | 40 | changeset: 1:9cd25b479c51 |
|
43 | 41 | tag: tip |
|
44 | 42 | user: test |
|
45 | 43 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
46 | 44 | summary: amend base1 |
|
47 | 45 | |
|
48 | 46 | changeset: 0:ad120869acf0 |
|
49 | 47 | user: test |
|
50 | 48 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
51 | 49 | summary: base |
|
52 | 50 | |
|
53 | 51 | |
|
54 | 52 | Add new file: |
|
55 | 53 | |
|
56 | 54 | $ echo b > b |
|
57 | 55 | $ hg ci --amend -Am 'amend base1 new file' |
|
58 | 56 | adding b |
|
59 | 57 | saved backup bundle to $TESTTMP/.hg/strip-backup/9cd25b479c51-amend-backup.hg (glob) |
|
60 | 58 | |
|
61 | 59 | Remove file that was added in amended commit: |
|
62 | 60 | |
|
63 | 61 | $ hg rm b |
|
64 | 62 | $ hg ci --amend -m 'amend base1 remove new file' |
|
65 | 63 | saved backup bundle to $TESTTMP/.hg/strip-backup/e2bb3ecffd2f-amend-backup.hg (glob) |
|
66 | 64 | |
|
67 | 65 | $ hg cat b |
|
68 | 66 | b: no such file in rev 664a9b2d60cd |
|
69 | 67 | [1] |
|
70 | 68 | |
|
71 | 69 | No changes, just a different message: |
|
72 | 70 | |
|
73 | 71 | $ hg ci -v --amend -m 'no changes, new message' |
|
74 | 72 | amending changeset 664a9b2d60cd |
|
75 | 73 | copying changeset 664a9b2d60cd to ad120869acf0 |
|
76 | 74 | a |
|
77 | 75 | stripping amended changeset 664a9b2d60cd |
|
78 | 76 | 1 changesets found |
|
79 | 77 | saved backup bundle to $TESTTMP/.hg/strip-backup/664a9b2d60cd-amend-backup.hg (glob) |
|
80 | 78 | 1 changesets found |
|
81 | 79 | adding branch |
|
82 | 80 | adding changesets |
|
83 | 81 | adding manifests |
|
84 | 82 | adding file changes |
|
85 | 83 | added 1 changesets with 1 changes to 1 files |
|
86 | 84 | committed changeset 1:ea6e356ff2ad |
|
87 | 85 | $ hg diff -c . |
|
88 | 86 | diff -r ad120869acf0 -r ea6e356ff2ad a |
|
89 | 87 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
90 | 88 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
91 | 89 | @@ -1,1 +1,3 @@ |
|
92 | 90 | a |
|
93 | 91 | +a |
|
94 | 92 | +a |
|
95 | 93 | $ hg log |
|
96 | 94 | changeset: 1:ea6e356ff2ad |
|
97 | 95 | tag: tip |
|
98 | 96 | user: test |
|
99 | 97 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
100 | 98 | summary: no changes, new message |
|
101 | 99 | |
|
102 | 100 | changeset: 0:ad120869acf0 |
|
103 | 101 | user: test |
|
104 | 102 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
105 | 103 | summary: base |
|
106 | 104 | |
|
107 | 105 | |
|
108 | 106 | Disable default date on commit so when -d isn't given, the old date is preserved: |
|
109 | 107 | |
|
110 | 108 | $ echo '[defaults]' >> $HGRCPATH |
|
111 | 109 | $ echo 'commit=' >> $HGRCPATH |
|
112 | 110 | |
|
113 | 111 | Test -u/-d: |
|
114 | 112 | |
|
115 | 113 | $ hg ci --amend -u foo -d '1 0' |
|
116 | 114 | saved backup bundle to $TESTTMP/.hg/strip-backup/ea6e356ff2ad-amend-backup.hg (glob) |
|
117 | 115 | $ echo a >> a |
|
118 | 116 | $ hg ci --amend -u foo -d '1 0' |
|
119 | 117 | saved backup bundle to $TESTTMP/.hg/strip-backup/377b91ce8b56-amend-backup.hg (glob) |
|
120 | 118 | $ hg log -r . |
|
121 | 119 | changeset: 1:2c94e4a5756f |
|
122 | 120 | tag: tip |
|
123 | 121 | user: foo |
|
124 | 122 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
125 | 123 | summary: no changes, new message |
|
126 | 124 | |
|
127 | 125 | |
|
128 | 126 | Open editor with old commit message if a message isn't given otherwise: |
|
129 | 127 | |
|
130 | $ cat > editor << '__EOF__' | |
|
128 | $ cat > editor.sh << '__EOF__' | |
|
131 | 129 | > #!/bin/sh |
|
132 | 130 | > cat $1 |
|
133 | 131 | > echo "another precious commit message" > "$1" |
|
134 | 132 | > __EOF__ |
|
135 | $ chmod +x editor | |
|
136 | $ HGEDITOR="'`pwd`'"/editor hg commit --amend -v | |
|
133 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v | |
|
137 | 134 | amending changeset 2c94e4a5756f |
|
138 | 135 | copying changeset 2c94e4a5756f to ad120869acf0 |
|
139 | 136 | no changes, new message |
|
140 | 137 | |
|
141 | 138 | |
|
142 | 139 | HG: Enter commit message. Lines beginning with 'HG:' are removed. |
|
143 | 140 | HG: Leave message empty to abort commit. |
|
144 | 141 | HG: -- |
|
145 | 142 | HG: user: foo |
|
146 | 143 | HG: branch 'default' |
|
147 | 144 | HG: changed a |
|
148 | 145 | a |
|
149 | 146 | stripping amended changeset 2c94e4a5756f |
|
150 | 147 | 1 changesets found |
|
151 | 148 | saved backup bundle to $TESTTMP/.hg/strip-backup/2c94e4a5756f-amend-backup.hg (glob) |
|
152 | 149 | 1 changesets found |
|
153 | 150 | adding branch |
|
154 | 151 | adding changesets |
|
155 | 152 | adding manifests |
|
156 | 153 | adding file changes |
|
157 | 154 | added 1 changesets with 1 changes to 1 files |
|
158 | 155 | committed changeset 1:ffb49186f961 |
|
159 | 156 | |
|
160 | 157 | Same, but with changes in working dir (different code path): |
|
161 | 158 | |
|
162 | 159 | $ echo a >> a |
|
163 |
$ HGEDITOR=" |
|
|
160 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v | |
|
164 | 161 | amending changeset ffb49186f961 |
|
165 | 162 | another precious commit message |
|
166 | 163 | |
|
167 | 164 | |
|
168 | 165 | HG: Enter commit message. Lines beginning with 'HG:' are removed. |
|
169 | 166 | HG: Leave message empty to abort commit. |
|
170 | 167 | HG: -- |
|
171 | 168 | HG: user: foo |
|
172 | 169 | HG: branch 'default' |
|
173 | 170 | HG: changed a |
|
174 | 171 | a |
|
175 | 172 | copying changeset 27f3aacd3011 to ad120869acf0 |
|
176 | 173 | a |
|
177 | 174 | stripping intermediate changeset 27f3aacd3011 |
|
178 | 175 | stripping amended changeset ffb49186f961 |
|
179 | 176 | 2 changesets found |
|
180 | 177 | saved backup bundle to $TESTTMP/.hg/strip-backup/ffb49186f961-amend-backup.hg (glob) |
|
181 | 178 | 1 changesets found |
|
182 | 179 | adding branch |
|
183 | 180 | adding changesets |
|
184 | 181 | adding manifests |
|
185 | 182 | adding file changes |
|
186 | 183 | added 1 changesets with 1 changes to 1 files |
|
187 | 184 | committed changeset 1:fb6cca43446f |
|
188 | 185 | |
|
189 | $ rm editor | |
|
186 | $ rm editor.sh | |
|
190 | 187 | $ hg log -r . |
|
191 | 188 | changeset: 1:fb6cca43446f |
|
192 | 189 | tag: tip |
|
193 | 190 | user: foo |
|
194 | 191 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
195 | 192 | summary: another precious commit message |
|
196 | 193 | |
|
197 | 194 | |
|
198 | 195 | Moving bookmarks, preserve active bookmark: |
|
199 | 196 | |
|
200 | 197 | $ hg book book1 |
|
201 | 198 | $ hg book book2 |
|
202 | 199 | $ hg ci --amend -m 'move bookmarks' |
|
203 | 200 | saved backup bundle to $TESTTMP/.hg/strip-backup/fb6cca43446f-amend-backup.hg (glob) |
|
204 | 201 | $ hg book |
|
205 | 202 | book1 1:0cf1c7a51bcf |
|
206 | 203 | * book2 1:0cf1c7a51bcf |
|
207 | 204 | $ echo a >> a |
|
208 | 205 | $ hg ci --amend -m 'move bookmarks' |
|
209 | 206 | saved backup bundle to $TESTTMP/.hg/strip-backup/0cf1c7a51bcf-amend-backup.hg (glob) |
|
210 | 207 | $ hg book |
|
211 | 208 | book1 1:7344472bd951 |
|
212 | 209 | * book2 1:7344472bd951 |
|
213 | 210 | |
|
214 | 211 | $ echo '[defaults]' >> $HGRCPATH |
|
215 | 212 | $ echo "commit=-d '0 0'" >> $HGRCPATH |
|
216 | 213 | |
|
217 | 214 | Moving branches: |
|
218 | 215 | |
|
219 | 216 | $ hg branch foo |
|
220 | 217 | marked working directory as branch foo |
|
221 | 218 | (branches are permanent and global, did you want a bookmark?) |
|
222 | 219 | $ echo a >> a |
|
223 | 220 | $ hg ci -m 'branch foo' |
|
224 | 221 | $ hg branch default -f |
|
225 | 222 | marked working directory as branch default |
|
226 | 223 | (branches are permanent and global, did you want a bookmark?) |
|
227 | 224 | $ hg ci --amend -m 'back to default' |
|
228 | 225 | saved backup bundle to $TESTTMP/.hg/strip-backup/1661ca36a2db-amend-backup.hg (glob) |
|
229 | 226 | $ hg branches |
|
230 | 227 | default 2:f24ee5961967 |
|
231 | 228 | |
|
232 | 229 | Close branch: |
|
233 | 230 | |
|
234 | 231 | $ hg up -q 0 |
|
235 | 232 | $ echo b >> b |
|
236 | 233 | $ hg branch foo |
|
237 | 234 | marked working directory as branch foo |
|
238 | 235 | (branches are permanent and global, did you want a bookmark?) |
|
239 | 236 | $ hg ci -Am 'fork' |
|
240 | 237 | adding b |
|
241 | 238 | $ echo b >> b |
|
242 | 239 | $ hg ci -mb |
|
243 | 240 | $ hg ci --amend --close-branch -m 'closing branch foo' |
|
244 | 241 | saved backup bundle to $TESTTMP/.hg/strip-backup/c962248fa264-amend-backup.hg (glob) |
|
245 | 242 | |
|
246 | 243 | Same thing, different code path: |
|
247 | 244 | |
|
248 | 245 | $ echo b >> b |
|
249 | 246 | $ hg ci -m 'reopen branch' |
|
250 | 247 | reopening closed branch head 4 |
|
251 | 248 | $ echo b >> b |
|
252 | 249 | $ hg ci --amend --close-branch |
|
253 | 250 | saved backup bundle to $TESTTMP/.hg/strip-backup/5e302dcc12b8-amend-backup.hg (glob) |
|
254 | 251 | $ hg branches |
|
255 | 252 | default 2:f24ee5961967 |
|
256 | 253 | |
|
257 | 254 | Refuse to amend merges: |
|
258 | 255 | |
|
259 | 256 | $ hg up -q default |
|
260 | 257 | $ hg merge foo |
|
261 | 258 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
262 | 259 | (branch merge, don't forget to commit) |
|
263 | 260 | $ hg ci --amend |
|
264 | 261 | abort: cannot amend while merging |
|
265 | 262 | [255] |
|
266 | 263 | $ hg ci -m 'merge' |
|
267 | 264 | $ hg ci --amend |
|
268 | 265 | abort: cannot amend merge changesets |
|
269 | 266 | [255] |
|
270 | 267 | |
|
271 | 268 | Follow copies/renames: |
|
272 | 269 | |
|
273 | 270 | $ hg mv b c |
|
274 | 271 | $ hg ci -m 'b -> c' |
|
275 | 272 | $ hg mv c d |
|
276 | 273 | $ hg ci --amend -m 'b -> d' |
|
277 | 274 | saved backup bundle to $TESTTMP/.hg/strip-backup/9c207120aa98-amend-backup.hg (glob) |
|
278 | 275 | $ hg st --rev '.^' --copies d |
|
279 | 276 | A d |
|
280 | 277 | b |
|
281 | 278 | $ hg cp d e |
|
282 | 279 | $ hg ci -m 'e = d' |
|
283 | 280 | $ hg cp e f |
|
284 | 281 | $ hg ci --amend -m 'f = d' |
|
285 | 282 | saved backup bundle to $TESTTMP/.hg/strip-backup/fda2b3b27b22-amend-backup.hg (glob) |
|
286 | 283 | $ hg st --rev '.^' --copies f |
|
287 | 284 | A f |
|
288 | 285 | d |
|
289 | 286 | |
|
290 | 287 | $ mv f f.orig |
|
291 | 288 | $ hg rm -A f |
|
292 | 289 | $ hg ci -m removef |
|
293 | 290 | $ hg cp a f |
|
294 | 291 | $ mv f.orig f |
|
295 | 292 | $ hg ci --amend -m replacef |
|
296 | 293 | saved backup bundle to $TESTTMP/.hg/strip-backup/20a7413547f9-amend-backup.hg (glob) |
|
297 | 294 | $ hg st --change . --copies |
|
298 | 295 | $ hg log -r . --template "{file_copies}\n" |
|
299 | 296 | |
|
300 | 297 | |
|
301 | 298 | Move added file (issue3410): |
|
302 | 299 | |
|
303 | 300 | $ echo g >> g |
|
304 | 301 | $ hg ci -Am g |
|
305 | 302 | adding g |
|
306 | 303 | $ hg mv g h |
|
307 | 304 | $ hg ci --amend |
|
308 | 305 | saved backup bundle to $TESTTMP/.hg/strip-backup/5daa77a5d616-amend-backup.hg (glob) |
|
309 | 306 | $ hg st --change . --copies h |
|
310 | 307 | A h |
|
311 | 308 | $ hg log -r . --template "{file_copies}\n" |
|
312 | 309 | |
|
313 | 310 | |
|
314 | 311 | Can't rollback an amend: |
|
315 | 312 | |
|
316 | 313 | $ hg rollback |
|
317 | 314 | no rollback information available |
|
318 | 315 | [1] |
|
319 | 316 | |
|
320 | 317 | Preserve extra dict (issue3430): |
|
321 | 318 | |
|
322 | 319 | $ hg branch a |
|
323 | 320 | marked working directory as branch a |
|
324 | 321 | (branches are permanent and global, did you want a bookmark?) |
|
325 | 322 | $ echo a >> a |
|
326 | 323 | $ hg ci -ma |
|
327 | 324 | $ hg ci --amend -m "a'" |
|
328 | 325 | saved backup bundle to $TESTTMP/.hg/strip-backup/167f8e3031df-amend-backup.hg (glob) |
|
329 | 326 | $ hg log -r . --template "{branch}\n" |
|
330 | 327 | a |
|
331 | 328 | $ hg ci --amend -m "a''" |
|
332 | 329 | saved backup bundle to $TESTTMP/.hg/strip-backup/ceac1a44c806-amend-backup.hg (glob) |
|
333 | 330 | $ hg log -r . --template "{branch}\n" |
|
334 | 331 | a |
|
335 | 332 | |
|
336 | 333 | Also preserve other entries in the dict that are in the old commit, |
|
337 | 334 | first graft something so there's an additional entry: |
|
338 | 335 | |
|
339 | 336 | $ hg up 0 -q |
|
340 | 337 | $ echo z > z |
|
341 | 338 | $ hg ci -Am 'fork' |
|
342 | 339 | adding z |
|
343 | 340 | created new head |
|
344 | 341 | $ hg up 11 |
|
345 | 342 | 5 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
346 | 343 | $ hg graft 12 |
|
347 | 344 | grafting revision 12 |
|
348 | 345 | $ hg ci --amend -m 'graft amend' |
|
349 | 346 | saved backup bundle to $TESTTMP/.hg/strip-backup/18a5124daf7a-amend-backup.hg (glob) |
|
350 | 347 | $ hg log -r . --debug | grep extra |
|
351 | 348 | extra: branch=a |
|
352 | 349 | extra: source=2647734878ef0236dda712fae9c1651cf694ea8a |
@@ -1,2390 +1,2386 b'' | |||
|
1 | $ "$TESTDIR/hghave" system-sh || exit 80 | |
|
2 | ||
|
3 | 1 |
|
|
4 | 2 | $ echo "patchbomb=" >> $HGRCPATH |
|
5 | 3 | |
|
6 | 4 | $ hg init t |
|
7 | 5 | $ cd t |
|
8 | 6 | $ echo a > a |
|
9 | 7 | $ hg commit -Ama -d '1 0' |
|
10 | 8 | adding a |
|
11 | 9 | |
|
12 | 10 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -r tip |
|
13 | 11 | This patch series consists of 1 patches. |
|
14 | 12 | |
|
15 | 13 | |
|
16 | 14 | Displaying [PATCH] a ... |
|
17 | 15 | Content-Type: text/plain; charset="us-ascii" |
|
18 | 16 | MIME-Version: 1.0 |
|
19 | 17 | Content-Transfer-Encoding: 7bit |
|
20 | 18 | Subject: [PATCH] a |
|
21 | 19 | X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
22 | 20 | Message-Id: <8580ff50825a50c8f716.60@*> (glob) |
|
23 | 21 | User-Agent: Mercurial-patchbomb/* (glob) |
|
24 | 22 | Date: Thu, 01 Jan 1970 00:01:00 +0000 |
|
25 | 23 | From: quux |
|
26 | 24 | To: foo |
|
27 | 25 | Cc: bar |
|
28 | 26 | |
|
29 | 27 | # HG changeset patch |
|
30 | 28 | # User test |
|
31 | 29 | # Date 1 0 |
|
32 | 30 | # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
33 | 31 | # Parent 0000000000000000000000000000000000000000 |
|
34 | 32 | a |
|
35 | 33 | |
|
36 | 34 | diff -r 000000000000 -r 8580ff50825a a |
|
37 | 35 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
38 | 36 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
39 | 37 | @@ -0,0 +1,1 @@ |
|
40 | 38 | +a |
|
41 | 39 | |
|
42 | 40 | |
|
43 | 41 | $ hg --config ui.interactive=1 email --confirm -n -f quux -t foo -c bar -r tip<<EOF |
|
44 | 42 | > n |
|
45 | 43 | > EOF |
|
46 | 44 | This patch series consists of 1 patches. |
|
47 | 45 | |
|
48 | 46 | |
|
49 | 47 | Final summary: |
|
50 | 48 | |
|
51 | 49 | From: quux |
|
52 | 50 | To: foo |
|
53 | 51 | Cc: bar |
|
54 | 52 | Subject: [PATCH] a |
|
55 | 53 | a | 1 + |
|
56 | 54 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
57 | 55 | |
|
58 | 56 | are you sure you want to send (yn)? abort: patchbomb canceled |
|
59 | 57 | [255] |
|
60 | 58 | |
|
61 | 59 | $ echo b > b |
|
62 | 60 | $ hg commit -Amb -d '2 0' |
|
63 | 61 | adding b |
|
64 | 62 | |
|
65 | 63 | $ hg email --date '1970-1-1 0:2' -n -f quux -t foo -c bar -s test -r 0:tip |
|
66 | 64 | This patch series consists of 2 patches. |
|
67 | 65 | |
|
68 | 66 | |
|
69 | 67 | Write the introductory message for the patch series. |
|
70 | 68 | |
|
71 | 69 | |
|
72 | 70 | Displaying [PATCH 0 of 2] test ... |
|
73 | 71 | Content-Type: text/plain; charset="us-ascii" |
|
74 | 72 | MIME-Version: 1.0 |
|
75 | 73 | Content-Transfer-Encoding: 7bit |
|
76 | 74 | Subject: [PATCH 0 of 2] test |
|
77 | 75 | Message-Id: <patchbomb.120@*> (glob) |
|
78 | 76 | User-Agent: Mercurial-patchbomb/* (glob) |
|
79 | 77 | Date: Thu, 01 Jan 1970 00:02:00 +0000 |
|
80 | 78 | From: quux |
|
81 | 79 | To: foo |
|
82 | 80 | Cc: bar |
|
83 | 81 | |
|
84 | 82 | |
|
85 | 83 | Displaying [PATCH 1 of 2] a ... |
|
86 | 84 | Content-Type: text/plain; charset="us-ascii" |
|
87 | 85 | MIME-Version: 1.0 |
|
88 | 86 | Content-Transfer-Encoding: 7bit |
|
89 | 87 | Subject: [PATCH 1 of 2] a |
|
90 | 88 | X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
91 | 89 | Message-Id: <8580ff50825a50c8f716.121@*> (glob) |
|
92 | 90 | In-Reply-To: <patchbomb.120@*> (glob) |
|
93 | 91 | References: <patchbomb.120@*> (glob) |
|
94 | 92 | User-Agent: Mercurial-patchbomb/* (glob) |
|
95 | 93 | Date: Thu, 01 Jan 1970 00:02:01 +0000 |
|
96 | 94 | From: quux |
|
97 | 95 | To: foo |
|
98 | 96 | Cc: bar |
|
99 | 97 | |
|
100 | 98 | # HG changeset patch |
|
101 | 99 | # User test |
|
102 | 100 | # Date 1 0 |
|
103 | 101 | # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
104 | 102 | # Parent 0000000000000000000000000000000000000000 |
|
105 | 103 | a |
|
106 | 104 | |
|
107 | 105 | diff -r 000000000000 -r 8580ff50825a a |
|
108 | 106 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
109 | 107 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
110 | 108 | @@ -0,0 +1,1 @@ |
|
111 | 109 | +a |
|
112 | 110 | |
|
113 | 111 | Displaying [PATCH 2 of 2] b ... |
|
114 | 112 | Content-Type: text/plain; charset="us-ascii" |
|
115 | 113 | MIME-Version: 1.0 |
|
116 | 114 | Content-Transfer-Encoding: 7bit |
|
117 | 115 | Subject: [PATCH 2 of 2] b |
|
118 | 116 | X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
119 | 117 | Message-Id: <97d72e5f12c7e84f8506.122@*> (glob) |
|
120 | 118 | In-Reply-To: <patchbomb.120@*> (glob) |
|
121 | 119 | References: <patchbomb.120@*> (glob) |
|
122 | 120 | User-Agent: Mercurial-patchbomb/* (glob) |
|
123 | 121 | Date: Thu, 01 Jan 1970 00:02:02 +0000 |
|
124 | 122 | From: quux |
|
125 | 123 | To: foo |
|
126 | 124 | Cc: bar |
|
127 | 125 | |
|
128 | 126 | # HG changeset patch |
|
129 | 127 | # User test |
|
130 | 128 | # Date 2 0 |
|
131 | 129 | # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
132 | 130 | # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
133 | 131 | b |
|
134 | 132 | |
|
135 | 133 | diff -r 8580ff50825a -r 97d72e5f12c7 b |
|
136 | 134 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
137 | 135 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
138 | 136 | @@ -0,0 +1,1 @@ |
|
139 | 137 | +b |
|
140 | 138 | |
|
141 | 139 | |
|
142 | 140 | .hg/last-email.txt |
|
143 | 141 | |
|
144 | $ cat > editor << '__EOF__' | |
|
145 | > #!/bin/sh | |
|
142 | $ cat > editor.sh << '__EOF__' | |
|
146 | 143 | > echo "a precious introductory message" > "$1" |
|
147 | 144 | > __EOF__ |
|
148 | $ chmod +x editor | |
|
149 | $ HGEDITOR="'`pwd`'"/editor hg email -n -t foo -s test -r 0:tip > /dev/null | |
|
145 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg email -n -t foo -s test -r 0:tip > /dev/null | |
|
150 | 146 | $ cat .hg/last-email.txt |
|
151 | 147 | a precious introductory message |
|
152 | 148 | |
|
153 | 149 | $ hg email -m test.mbox -f quux -t foo -c bar -s test 0:tip \ |
|
154 | 150 | > --config extensions.progress= --config progress.assume-tty=1 \ |
|
155 | 151 | > --config progress.delay=0 --config progress.refresh=0 \ |
|
156 | 152 | > --config progress.width=60 2>&1 | \ |
|
157 | 153 | > python "$TESTDIR/filtercr.py" |
|
158 | 154 | This patch series consists of 2 patches. |
|
159 | 155 | |
|
160 | 156 | |
|
161 | 157 | Write the introductory message for the patch series. |
|
162 | 158 | |
|
163 | 159 | |
|
164 | 160 | sending [ ] 0/3 |
|
165 | 161 | sending [ ] 0/3 |
|
166 | 162 | |
|
167 | 163 | |
|
168 | 164 | sending [==============> ] 1/3 |
|
169 | 165 | sending [==============> ] 1/3 |
|
170 | 166 | |
|
171 | 167 | |
|
172 | 168 | sending [=============================> ] 2/3 |
|
173 | 169 | sending [=============================> ] 2/3 |
|
174 | 170 | \r (esc) |
|
175 | 171 | Sending [PATCH 0 of 2] test ... |
|
176 | 172 | Sending [PATCH 1 of 2] a ... |
|
177 | 173 | Sending [PATCH 2 of 2] b ... |
|
178 | 174 | |
|
179 | 175 | |
|
180 | 176 | $ cd .. |
|
181 | 177 | |
|
182 | 178 | $ hg clone -q t t2 |
|
183 | 179 | $ cd t2 |
|
184 | 180 | $ echo c > c |
|
185 | 181 | $ hg commit -Amc -d '3 0' |
|
186 | 182 | adding c |
|
187 | 183 | |
|
188 | 184 | $ cat > description <<EOF |
|
189 | 185 | > a multiline |
|
190 | 186 | > |
|
191 | 187 | > description |
|
192 | 188 | > EOF |
|
193 | 189 | |
|
194 | 190 | |
|
195 | 191 | test bundle and description: |
|
196 | 192 | $ hg email --date '1970-1-1 0:3' -n -f quux -t foo \ |
|
197 | 193 | > -c bar -s test -r tip -b --desc description |
|
198 | 194 | searching for changes |
|
199 | 195 | 1 changesets found |
|
200 | 196 | |
|
201 | 197 | Displaying test ... |
|
202 | 198 | Content-Type: multipart/mixed; boundary="===*" (glob) |
|
203 | 199 | MIME-Version: 1.0 |
|
204 | 200 | Subject: test |
|
205 | 201 | Message-Id: <patchbomb.180@*> (glob) |
|
206 | 202 | User-Agent: Mercurial-patchbomb/* (glob) |
|
207 | 203 | Date: Thu, 01 Jan 1970 00:03:00 +0000 |
|
208 | 204 | From: quux |
|
209 | 205 | To: foo |
|
210 | 206 | Cc: bar |
|
211 | 207 | |
|
212 | 208 | --===* (glob) |
|
213 | 209 | Content-Type: text/plain; charset="us-ascii" |
|
214 | 210 | MIME-Version: 1.0 |
|
215 | 211 | Content-Transfer-Encoding: 7bit |
|
216 | 212 | |
|
217 | 213 | a multiline |
|
218 | 214 | |
|
219 | 215 | description |
|
220 | 216 | |
|
221 | 217 | --===* (glob) |
|
222 | 218 | Content-Type: application/x-mercurial-bundle |
|
223 | 219 | MIME-Version: 1.0 |
|
224 | 220 | Content-Disposition: attachment; filename="bundle.hg" |
|
225 | 221 | Content-Transfer-Encoding: base64 |
|
226 | 222 | |
|
227 | 223 | SEcxMEJaaDkxQVkmU1nvR7I3AAAN////lFYQWj1/4HwRkdC/AywIAk0E4pfoSIIIgQCgGEQOcLAA |
|
228 | 224 | 2tA1VPyp4mkeoG0EaaPU0GTT1GjRiNPIg9CZGBqZ6UbU9J+KFU09DNUaGgAAAAAANAGgAAAAA1U8 |
|
229 | 225 | oGgAADQGgAANNANAAAAAAZipFLz3XoakCEQB3PVPyHJVi1iYkAAKQAZQGpQGZESInRnCFMqLDla2 |
|
230 | 226 | Bx3qfRQeA2N4lnzKkAmP8kR2asievLLXXebVU8Vg4iEBqcJNJAxIapSU6SM4888ZAciRG6MYAIEE |
|
231 | 227 | SlIBpFisgGkyRjX//TMtfcUAEsGu56+YnE1OlTZmzKm8BSu2rvo4rHAYYaadIFFuTy0LYgIkgLVD |
|
232 | 228 | sgVa2F19D1tx9+hgbAygLgQwaIqcDdgA4BjQgIiz/AEP72++llgDKhKducqodGE4B0ETqF3JFOFC |
|
233 | 229 | Q70eyNw= |
|
234 | 230 | --===*-- (glob) |
|
235 | 231 | |
|
236 | 232 | utf-8 patch: |
|
237 | 233 | $ python -c 'fp = open("utf", "wb"); fp.write("h\xC3\xB6mma!\n"); fp.close();' |
|
238 | 234 | $ hg commit -A -d '4 0' -m 'utf-8 content' |
|
239 | 235 | adding description |
|
240 | 236 | adding utf |
|
241 | 237 | |
|
242 | 238 | no mime encoding for email --test: |
|
243 | 239 | $ hg email --date '1970-1-1 0:4' -f quux -t foo -c bar -r tip -n |
|
244 | 240 | This patch series consists of 1 patches. |
|
245 | 241 | |
|
246 | 242 | |
|
247 | 243 | Displaying [PATCH] utf-8 content ... |
|
248 | 244 | Content-Type: text/plain; charset="us-ascii" |
|
249 | 245 | MIME-Version: 1.0 |
|
250 | 246 | Content-Transfer-Encoding: 8bit |
|
251 | 247 | Subject: [PATCH] utf-8 content |
|
252 | 248 | X-Mercurial-Node: 909a00e13e9d78b575aeee23dddbada46d5a143f |
|
253 | 249 | Message-Id: <909a00e13e9d78b575ae.240@*> (glob) |
|
254 | 250 | User-Agent: Mercurial-patchbomb/* (glob) |
|
255 | 251 | Date: Thu, 01 Jan 1970 00:04:00 +0000 |
|
256 | 252 | From: quux |
|
257 | 253 | To: foo |
|
258 | 254 | Cc: bar |
|
259 | 255 | |
|
260 | 256 | # HG changeset patch |
|
261 | 257 | # User test |
|
262 | 258 | # Date 4 0 |
|
263 | 259 | # Node ID 909a00e13e9d78b575aeee23dddbada46d5a143f |
|
264 | 260 | # Parent ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
265 | 261 | utf-8 content |
|
266 | 262 | |
|
267 | 263 | diff -r ff2c9fa2018b -r 909a00e13e9d description |
|
268 | 264 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
269 | 265 | +++ b/description Thu Jan 01 00:00:04 1970 +0000 |
|
270 | 266 | @@ -0,0 +1,3 @@ |
|
271 | 267 | +a multiline |
|
272 | 268 | + |
|
273 | 269 | +description |
|
274 | 270 | diff -r ff2c9fa2018b -r 909a00e13e9d utf |
|
275 | 271 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
276 | 272 | +++ b/utf Thu Jan 01 00:00:04 1970 +0000 |
|
277 | 273 | @@ -0,0 +1,1 @@ |
|
278 | 274 | +h\xc3\xb6mma! (esc) |
|
279 | 275 | |
|
280 | 276 | |
|
281 | 277 | mime encoded mbox (base64): |
|
282 | 278 | $ hg email --date '1970-1-1 0:4' -f 'Q <quux>' -t foo -c bar -r tip -m mbox |
|
283 | 279 | This patch series consists of 1 patches. |
|
284 | 280 | |
|
285 | 281 | |
|
286 | 282 | Sending [PATCH] utf-8 content ... |
|
287 | 283 | |
|
288 | 284 | $ cat mbox |
|
289 | 285 | From quux ... ... .. ..:..:.. .... (re) |
|
290 | 286 | Content-Type: text/plain; charset="utf-8" |
|
291 | 287 | MIME-Version: 1.0 |
|
292 | 288 | Content-Transfer-Encoding: base64 |
|
293 | 289 | Subject: [PATCH] utf-8 content |
|
294 | 290 | X-Mercurial-Node: 909a00e13e9d78b575aeee23dddbada46d5a143f |
|
295 | 291 | Message-Id: <909a00e13e9d78b575ae.240@*> (glob) |
|
296 | 292 | User-Agent: Mercurial-patchbomb/* (glob) |
|
297 | 293 | Date: Thu, 01 Jan 1970 00:04:00 +0000 |
|
298 | 294 | From: Q <quux> |
|
299 | 295 | To: foo |
|
300 | 296 | Cc: bar |
|
301 | 297 | |
|
302 | 298 | IyBIRyBjaGFuZ2VzZXQgcGF0Y2gKIyBVc2VyIHRlc3QKIyBEYXRlIDQgMAojIE5vZGUgSUQgOTA5 |
|
303 | 299 | YTAwZTEzZTlkNzhiNTc1YWVlZTIzZGRkYmFkYTQ2ZDVhMTQzZgojIFBhcmVudCAgZmYyYzlmYTIw |
|
304 | 300 | MThiMTVmYTc0YjMzMzYzYmRhOTUyNzMyM2UyYTk5Zgp1dGYtOCBjb250ZW50CgpkaWZmIC1yIGZm |
|
305 | 301 | MmM5ZmEyMDE4YiAtciA5MDlhMDBlMTNlOWQgZGVzY3JpcHRpb24KLS0tIC9kZXYvbnVsbAlUaHUg |
|
306 | 302 | SmFuIDAxIDAwOjAwOjAwIDE5NzAgKzAwMDAKKysrIGIvZGVzY3JpcHRpb24JVGh1IEphbiAwMSAw |
|
307 | 303 | MDowMDowNCAxOTcwICswMDAwCkBAIC0wLDAgKzEsMyBAQAorYSBtdWx0aWxpbmUKKworZGVzY3Jp |
|
308 | 304 | cHRpb24KZGlmZiAtciBmZjJjOWZhMjAxOGIgLXIgOTA5YTAwZTEzZTlkIHV0ZgotLS0gL2Rldi9u |
|
309 | 305 | dWxsCVRodSBKYW4gMDEgMDA6MDA6MDAgMTk3MCArMDAwMAorKysgYi91dGYJVGh1IEphbiAwMSAw |
|
310 | 306 | MDowMDowNCAxOTcwICswMDAwCkBAIC0wLDAgKzEsMSBAQAoraMO2bW1hIQo= |
|
311 | 307 | |
|
312 | 308 | |
|
313 | 309 | $ python -c 'print open("mbox").read().split("\n\n")[1].decode("base64")' |
|
314 | 310 | # HG changeset patch |
|
315 | 311 | # User test |
|
316 | 312 | # Date 4 0 |
|
317 | 313 | # Node ID 909a00e13e9d78b575aeee23dddbada46d5a143f |
|
318 | 314 | # Parent ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
319 | 315 | utf-8 content |
|
320 | 316 | |
|
321 | 317 | diff -r ff2c9fa2018b -r 909a00e13e9d description |
|
322 | 318 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
323 | 319 | +++ b/description Thu Jan 01 00:00:04 1970 +0000 |
|
324 | 320 | @@ -0,0 +1,3 @@ |
|
325 | 321 | +a multiline |
|
326 | 322 | + |
|
327 | 323 | +description |
|
328 | 324 | diff -r ff2c9fa2018b -r 909a00e13e9d utf |
|
329 | 325 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
330 | 326 | +++ b/utf Thu Jan 01 00:00:04 1970 +0000 |
|
331 | 327 | @@ -0,0 +1,1 @@ |
|
332 | 328 | +h\xc3\xb6mma! (esc) |
|
333 | 329 | |
|
334 | 330 | $ rm mbox |
|
335 | 331 | |
|
336 | 332 | mime encoded mbox (quoted-printable): |
|
337 | 333 | $ python -c 'fp = open("long", "wb"); fp.write("%s\nfoo\n\nbar\n" % ("x" * 1024)); fp.close();' |
|
338 | 334 | $ hg commit -A -d '4 0' -m 'long line' |
|
339 | 335 | adding long |
|
340 | 336 | |
|
341 | 337 | no mime encoding for email --test: |
|
342 | 338 | $ hg email --date '1970-1-1 0:4' -f quux -t foo -c bar -r tip -n |
|
343 | 339 | This patch series consists of 1 patches. |
|
344 | 340 | |
|
345 | 341 | |
|
346 | 342 | Displaying [PATCH] long line ... |
|
347 | 343 | Content-Type: text/plain; charset="us-ascii" |
|
348 | 344 | MIME-Version: 1.0 |
|
349 | 345 | Content-Transfer-Encoding: quoted-printable |
|
350 | 346 | Subject: [PATCH] long line |
|
351 | 347 | X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 |
|
352 | 348 | Message-Id: <a2ea8fc83dd8b93cfd86.240@*> (glob) |
|
353 | 349 | User-Agent: Mercurial-patchbomb/* (glob) |
|
354 | 350 | Date: Thu, 01 Jan 1970 00:04:00 +0000 |
|
355 | 351 | From: quux |
|
356 | 352 | To: foo |
|
357 | 353 | Cc: bar |
|
358 | 354 | |
|
359 | 355 | # HG changeset patch |
|
360 | 356 | # User test |
|
361 | 357 | # Date 4 0 |
|
362 | 358 | # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 |
|
363 | 359 | # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f |
|
364 | 360 | long line |
|
365 | 361 | |
|
366 | 362 | diff -r 909a00e13e9d -r a2ea8fc83dd8 long |
|
367 | 363 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
368 | 364 | +++ b/long Thu Jan 01 00:00:04 1970 +0000 |
|
369 | 365 | @@ -0,0 +1,4 @@ |
|
370 | 366 | +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
371 | 367 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
372 | 368 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
373 | 369 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
374 | 370 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
375 | 371 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
376 | 372 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
377 | 373 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
378 | 374 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
379 | 375 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
380 | 376 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
381 | 377 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
382 | 378 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
383 | 379 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx |
|
384 | 380 | +foo |
|
385 | 381 | + |
|
386 | 382 | +bar |
|
387 | 383 | |
|
388 | 384 | |
|
389 | 385 | mime encoded mbox (quoted-printable): |
|
390 | 386 | $ hg email --date '1970-1-1 0:4' -f quux -t foo -c bar -r tip -m mbox |
|
391 | 387 | This patch series consists of 1 patches. |
|
392 | 388 | |
|
393 | 389 | |
|
394 | 390 | Sending [PATCH] long line ... |
|
395 | 391 | $ cat mbox |
|
396 | 392 | From quux ... ... .. ..:..:.. .... (re) |
|
397 | 393 | Content-Type: text/plain; charset="us-ascii" |
|
398 | 394 | MIME-Version: 1.0 |
|
399 | 395 | Content-Transfer-Encoding: quoted-printable |
|
400 | 396 | Subject: [PATCH] long line |
|
401 | 397 | X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 |
|
402 | 398 | Message-Id: <a2ea8fc83dd8b93cfd86.240@*> (glob) |
|
403 | 399 | User-Agent: Mercurial-patchbomb/* (glob) |
|
404 | 400 | Date: Thu, 01 Jan 1970 00:04:00 +0000 |
|
405 | 401 | From: quux |
|
406 | 402 | To: foo |
|
407 | 403 | Cc: bar |
|
408 | 404 | |
|
409 | 405 | # HG changeset patch |
|
410 | 406 | # User test |
|
411 | 407 | # Date 4 0 |
|
412 | 408 | # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 |
|
413 | 409 | # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f |
|
414 | 410 | long line |
|
415 | 411 | |
|
416 | 412 | diff -r 909a00e13e9d -r a2ea8fc83dd8 long |
|
417 | 413 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
418 | 414 | +++ b/long Thu Jan 01 00:00:04 1970 +0000 |
|
419 | 415 | @@ -0,0 +1,4 @@ |
|
420 | 416 | +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
421 | 417 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
422 | 418 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
423 | 419 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
424 | 420 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
425 | 421 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
426 | 422 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
427 | 423 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
428 | 424 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
429 | 425 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
430 | 426 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
431 | 427 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
432 | 428 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
433 | 429 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx |
|
434 | 430 | +foo |
|
435 | 431 | + |
|
436 | 432 | +bar |
|
437 | 433 | |
|
438 | 434 | |
|
439 | 435 | |
|
440 | 436 | $ rm mbox |
|
441 | 437 | |
|
442 | 438 | iso-8859-1 patch: |
|
443 | 439 | $ python -c 'fp = open("isolatin", "wb"); fp.write("h\xF6mma!\n"); fp.close();' |
|
444 | 440 | $ hg commit -A -d '5 0' -m 'isolatin 8-bit encoding' |
|
445 | 441 | adding isolatin |
|
446 | 442 | |
|
447 | 443 | fake ascii mbox: |
|
448 | 444 | $ hg email --date '1970-1-1 0:5' -f quux -t foo -c bar -r tip -m mbox |
|
449 | 445 | This patch series consists of 1 patches. |
|
450 | 446 | |
|
451 | 447 | |
|
452 | 448 | Sending [PATCH] isolatin 8-bit encoding ... |
|
453 | 449 | $ cat mbox |
|
454 | 450 | From quux ... ... .. ..:..:.. .... (re) |
|
455 | 451 | Content-Type: text/plain; charset="us-ascii" |
|
456 | 452 | MIME-Version: 1.0 |
|
457 | 453 | Content-Transfer-Encoding: 8bit |
|
458 | 454 | Subject: [PATCH] isolatin 8-bit encoding |
|
459 | 455 | X-Mercurial-Node: 240fb913fc1b7ff15ddb9f33e73d82bf5277c720 |
|
460 | 456 | Message-Id: <240fb913fc1b7ff15ddb.300@*> (glob) |
|
461 | 457 | User-Agent: Mercurial-patchbomb/* (glob) |
|
462 | 458 | Date: Thu, 01 Jan 1970 00:05:00 +0000 |
|
463 | 459 | From: quux |
|
464 | 460 | To: foo |
|
465 | 461 | Cc: bar |
|
466 | 462 | |
|
467 | 463 | # HG changeset patch |
|
468 | 464 | # User test |
|
469 | 465 | # Date 5 0 |
|
470 | 466 | # Node ID 240fb913fc1b7ff15ddb9f33e73d82bf5277c720 |
|
471 | 467 | # Parent a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 |
|
472 | 468 | isolatin 8-bit encoding |
|
473 | 469 | |
|
474 | 470 | diff -r a2ea8fc83dd8 -r 240fb913fc1b isolatin |
|
475 | 471 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
476 | 472 | +++ b/isolatin Thu Jan 01 00:00:05 1970 +0000 |
|
477 | 473 | @@ -0,0 +1,1 @@ |
|
478 | 474 | +h\xf6mma! (esc) |
|
479 | 475 | |
|
480 | 476 | |
|
481 | 477 | |
|
482 | 478 | test diffstat for single patch: |
|
483 | 479 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -d -y -r 2 |
|
484 | 480 | This patch series consists of 1 patches. |
|
485 | 481 | |
|
486 | 482 | |
|
487 | 483 | Final summary: |
|
488 | 484 | |
|
489 | 485 | From: quux |
|
490 | 486 | To: foo |
|
491 | 487 | Cc: bar |
|
492 | 488 | Subject: [PATCH] test |
|
493 | 489 | c | 1 + |
|
494 | 490 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
495 | 491 | |
|
496 | 492 | are you sure you want to send (yn)? y |
|
497 | 493 | |
|
498 | 494 | Displaying [PATCH] test ... |
|
499 | 495 | Content-Type: text/plain; charset="us-ascii" |
|
500 | 496 | MIME-Version: 1.0 |
|
501 | 497 | Content-Transfer-Encoding: 7bit |
|
502 | 498 | Subject: [PATCH] test |
|
503 | 499 | X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
504 | 500 | Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob) |
|
505 | 501 | User-Agent: Mercurial-patchbomb/* (glob) |
|
506 | 502 | Date: Thu, 01 Jan 1970 00:01:00 +0000 |
|
507 | 503 | From: quux |
|
508 | 504 | To: foo |
|
509 | 505 | Cc: bar |
|
510 | 506 | |
|
511 | 507 | c | 1 + |
|
512 | 508 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
513 | 509 | |
|
514 | 510 | |
|
515 | 511 | # HG changeset patch |
|
516 | 512 | # User test |
|
517 | 513 | # Date 3 0 |
|
518 | 514 | # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
519 | 515 | # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
520 | 516 | c |
|
521 | 517 | |
|
522 | 518 | diff -r 97d72e5f12c7 -r ff2c9fa2018b c |
|
523 | 519 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
524 | 520 | +++ b/c Thu Jan 01 00:00:03 1970 +0000 |
|
525 | 521 | @@ -0,0 +1,1 @@ |
|
526 | 522 | +c |
|
527 | 523 | |
|
528 | 524 | |
|
529 | 525 | test diffstat for multiple patches: |
|
530 | 526 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -d -y \ |
|
531 | 527 | > -r 0:1 |
|
532 | 528 | This patch series consists of 2 patches. |
|
533 | 529 | |
|
534 | 530 | |
|
535 | 531 | Write the introductory message for the patch series. |
|
536 | 532 | |
|
537 | 533 | |
|
538 | 534 | Final summary: |
|
539 | 535 | |
|
540 | 536 | From: quux |
|
541 | 537 | To: foo |
|
542 | 538 | Cc: bar |
|
543 | 539 | Subject: [PATCH 0 of 2] test |
|
544 | 540 | a | 1 + |
|
545 | 541 | b | 1 + |
|
546 | 542 | 2 files changed, 2 insertions(+), 0 deletions(-) |
|
547 | 543 | Subject: [PATCH 1 of 2] a |
|
548 | 544 | a | 1 + |
|
549 | 545 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
550 | 546 | Subject: [PATCH 2 of 2] b |
|
551 | 547 | b | 1 + |
|
552 | 548 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
553 | 549 | |
|
554 | 550 | are you sure you want to send (yn)? y |
|
555 | 551 | |
|
556 | 552 | Displaying [PATCH 0 of 2] test ... |
|
557 | 553 | Content-Type: text/plain; charset="us-ascii" |
|
558 | 554 | MIME-Version: 1.0 |
|
559 | 555 | Content-Transfer-Encoding: 7bit |
|
560 | 556 | Subject: [PATCH 0 of 2] test |
|
561 | 557 | Message-Id: <patchbomb.60@*> (glob) |
|
562 | 558 | User-Agent: Mercurial-patchbomb/* (glob) |
|
563 | 559 | Date: Thu, 01 Jan 1970 00:01:00 +0000 |
|
564 | 560 | From: quux |
|
565 | 561 | To: foo |
|
566 | 562 | Cc: bar |
|
567 | 563 | |
|
568 | 564 | |
|
569 | 565 | a | 1 + |
|
570 | 566 | b | 1 + |
|
571 | 567 | 2 files changed, 2 insertions(+), 0 deletions(-) |
|
572 | 568 | |
|
573 | 569 | Displaying [PATCH 1 of 2] a ... |
|
574 | 570 | Content-Type: text/plain; charset="us-ascii" |
|
575 | 571 | MIME-Version: 1.0 |
|
576 | 572 | Content-Transfer-Encoding: 7bit |
|
577 | 573 | Subject: [PATCH 1 of 2] a |
|
578 | 574 | X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
579 | 575 | Message-Id: <8580ff50825a50c8f716.61@*> (glob) |
|
580 | 576 | In-Reply-To: <patchbomb.60@*> (glob) |
|
581 | 577 | References: <patchbomb.60@*> (glob) |
|
582 | 578 | User-Agent: Mercurial-patchbomb/* (glob) |
|
583 | 579 | Date: Thu, 01 Jan 1970 00:01:01 +0000 |
|
584 | 580 | From: quux |
|
585 | 581 | To: foo |
|
586 | 582 | Cc: bar |
|
587 | 583 | |
|
588 | 584 | a | 1 + |
|
589 | 585 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
590 | 586 | |
|
591 | 587 | |
|
592 | 588 | # HG changeset patch |
|
593 | 589 | # User test |
|
594 | 590 | # Date 1 0 |
|
595 | 591 | # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
596 | 592 | # Parent 0000000000000000000000000000000000000000 |
|
597 | 593 | a |
|
598 | 594 | |
|
599 | 595 | diff -r 000000000000 -r 8580ff50825a a |
|
600 | 596 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
601 | 597 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
602 | 598 | @@ -0,0 +1,1 @@ |
|
603 | 599 | +a |
|
604 | 600 | |
|
605 | 601 | Displaying [PATCH 2 of 2] b ... |
|
606 | 602 | Content-Type: text/plain; charset="us-ascii" |
|
607 | 603 | MIME-Version: 1.0 |
|
608 | 604 | Content-Transfer-Encoding: 7bit |
|
609 | 605 | Subject: [PATCH 2 of 2] b |
|
610 | 606 | X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
611 | 607 | Message-Id: <97d72e5f12c7e84f8506.62@*> (glob) |
|
612 | 608 | In-Reply-To: <patchbomb.60@*> (glob) |
|
613 | 609 | References: <patchbomb.60@*> (glob) |
|
614 | 610 | User-Agent: Mercurial-patchbomb/* (glob) |
|
615 | 611 | Date: Thu, 01 Jan 1970 00:01:02 +0000 |
|
616 | 612 | From: quux |
|
617 | 613 | To: foo |
|
618 | 614 | Cc: bar |
|
619 | 615 | |
|
620 | 616 | b | 1 + |
|
621 | 617 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
622 | 618 | |
|
623 | 619 | |
|
624 | 620 | # HG changeset patch |
|
625 | 621 | # User test |
|
626 | 622 | # Date 2 0 |
|
627 | 623 | # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
628 | 624 | # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
629 | 625 | b |
|
630 | 626 | |
|
631 | 627 | diff -r 8580ff50825a -r 97d72e5f12c7 b |
|
632 | 628 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
633 | 629 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
634 | 630 | @@ -0,0 +1,1 @@ |
|
635 | 631 | +b |
|
636 | 632 | |
|
637 | 633 | |
|
638 | 634 | test inline for single patch: |
|
639 | 635 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 2 |
|
640 | 636 | This patch series consists of 1 patches. |
|
641 | 637 | |
|
642 | 638 | |
|
643 | 639 | Displaying [PATCH] test ... |
|
644 | 640 | Content-Type: multipart/mixed; boundary="===*" (glob) |
|
645 | 641 | MIME-Version: 1.0 |
|
646 | 642 | Subject: [PATCH] test |
|
647 | 643 | X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
648 | 644 | Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob) |
|
649 | 645 | User-Agent: Mercurial-patchbomb/* (glob) |
|
650 | 646 | Date: Thu, 01 Jan 1970 00:01:00 +0000 |
|
651 | 647 | From: quux |
|
652 | 648 | To: foo |
|
653 | 649 | Cc: bar |
|
654 | 650 | |
|
655 | 651 | --===* (glob) |
|
656 | 652 | Content-Type: text/x-patch; charset="us-ascii" |
|
657 | 653 | MIME-Version: 1.0 |
|
658 | 654 | Content-Transfer-Encoding: 7bit |
|
659 | 655 | Content-Disposition: inline; filename=t2.patch |
|
660 | 656 | |
|
661 | 657 | # HG changeset patch |
|
662 | 658 | # User test |
|
663 | 659 | # Date 3 0 |
|
664 | 660 | # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
665 | 661 | # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
666 | 662 | c |
|
667 | 663 | |
|
668 | 664 | diff -r 97d72e5f12c7 -r ff2c9fa2018b c |
|
669 | 665 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
670 | 666 | +++ b/c Thu Jan 01 00:00:03 1970 +0000 |
|
671 | 667 | @@ -0,0 +1,1 @@ |
|
672 | 668 | +c |
|
673 | 669 | |
|
674 | 670 | --===*-- (glob) |
|
675 | 671 | |
|
676 | 672 | |
|
677 | 673 | test inline for single patch (quoted-printable): |
|
678 | 674 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 4 |
|
679 | 675 | This patch series consists of 1 patches. |
|
680 | 676 | |
|
681 | 677 | |
|
682 | 678 | Displaying [PATCH] test ... |
|
683 | 679 | Content-Type: multipart/mixed; boundary="===*" (glob) |
|
684 | 680 | MIME-Version: 1.0 |
|
685 | 681 | Subject: [PATCH] test |
|
686 | 682 | X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 |
|
687 | 683 | Message-Id: <a2ea8fc83dd8b93cfd86.60@*> (glob) |
|
688 | 684 | User-Agent: Mercurial-patchbomb/* (glob) |
|
689 | 685 | Date: Thu, 01 Jan 1970 00:01:00 +0000 |
|
690 | 686 | From: quux |
|
691 | 687 | To: foo |
|
692 | 688 | Cc: bar |
|
693 | 689 | |
|
694 | 690 | --===* (glob) |
|
695 | 691 | Content-Type: text/x-patch; charset="us-ascii" |
|
696 | 692 | MIME-Version: 1.0 |
|
697 | 693 | Content-Transfer-Encoding: quoted-printable |
|
698 | 694 | Content-Disposition: inline; filename=t2.patch |
|
699 | 695 | |
|
700 | 696 | # HG changeset patch |
|
701 | 697 | # User test |
|
702 | 698 | # Date 4 0 |
|
703 | 699 | # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 |
|
704 | 700 | # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f |
|
705 | 701 | long line |
|
706 | 702 | |
|
707 | 703 | diff -r 909a00e13e9d -r a2ea8fc83dd8 long |
|
708 | 704 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
709 | 705 | +++ b/long Thu Jan 01 00:00:04 1970 +0000 |
|
710 | 706 | @@ -0,0 +1,4 @@ |
|
711 | 707 | +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
712 | 708 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
713 | 709 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
714 | 710 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
715 | 711 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
716 | 712 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
717 | 713 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
718 | 714 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
719 | 715 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
720 | 716 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
721 | 717 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
722 | 718 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
723 | 719 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
724 | 720 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx |
|
725 | 721 | +foo |
|
726 | 722 | + |
|
727 | 723 | +bar |
|
728 | 724 | |
|
729 | 725 | --===*-- (glob) |
|
730 | 726 | |
|
731 | 727 | test inline for multiple patches: |
|
732 | 728 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i \ |
|
733 | 729 | > -r 0:1 -r 4 |
|
734 | 730 | This patch series consists of 3 patches. |
|
735 | 731 | |
|
736 | 732 | |
|
737 | 733 | Write the introductory message for the patch series. |
|
738 | 734 | |
|
739 | 735 | |
|
740 | 736 | Displaying [PATCH 0 of 3] test ... |
|
741 | 737 | Content-Type: text/plain; charset="us-ascii" |
|
742 | 738 | MIME-Version: 1.0 |
|
743 | 739 | Content-Transfer-Encoding: 7bit |
|
744 | 740 | Subject: [PATCH 0 of 3] test |
|
745 | 741 | Message-Id: <patchbomb.60@*> (glob) |
|
746 | 742 | User-Agent: Mercurial-patchbomb/* (glob) |
|
747 | 743 | Date: Thu, 01 Jan 1970 00:01:00 +0000 |
|
748 | 744 | From: quux |
|
749 | 745 | To: foo |
|
750 | 746 | Cc: bar |
|
751 | 747 | |
|
752 | 748 | |
|
753 | 749 | Displaying [PATCH 1 of 3] a ... |
|
754 | 750 | Content-Type: multipart/mixed; boundary="===*" (glob) |
|
755 | 751 | MIME-Version: 1.0 |
|
756 | 752 | Subject: [PATCH 1 of 3] a |
|
757 | 753 | X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
758 | 754 | Message-Id: <8580ff50825a50c8f716.61@*> (glob) |
|
759 | 755 | In-Reply-To: <patchbomb.60@*> (glob) |
|
760 | 756 | References: <patchbomb.60@*> (glob) |
|
761 | 757 | User-Agent: Mercurial-patchbomb/* (glob) |
|
762 | 758 | Date: Thu, 01 Jan 1970 00:01:01 +0000 |
|
763 | 759 | From: quux |
|
764 | 760 | To: foo |
|
765 | 761 | Cc: bar |
|
766 | 762 | |
|
767 | 763 | --===* (glob) |
|
768 | 764 | Content-Type: text/x-patch; charset="us-ascii" |
|
769 | 765 | MIME-Version: 1.0 |
|
770 | 766 | Content-Transfer-Encoding: 7bit |
|
771 | 767 | Content-Disposition: inline; filename=t2-1.patch |
|
772 | 768 | |
|
773 | 769 | # HG changeset patch |
|
774 | 770 | # User test |
|
775 | 771 | # Date 1 0 |
|
776 | 772 | # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
777 | 773 | # Parent 0000000000000000000000000000000000000000 |
|
778 | 774 | a |
|
779 | 775 | |
|
780 | 776 | diff -r 000000000000 -r 8580ff50825a a |
|
781 | 777 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
782 | 778 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
783 | 779 | @@ -0,0 +1,1 @@ |
|
784 | 780 | +a |
|
785 | 781 | |
|
786 | 782 | --===*-- (glob) |
|
787 | 783 | Displaying [PATCH 2 of 3] b ... |
|
788 | 784 | Content-Type: multipart/mixed; boundary="===*" (glob) |
|
789 | 785 | MIME-Version: 1.0 |
|
790 | 786 | Subject: [PATCH 2 of 3] b |
|
791 | 787 | X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
792 | 788 | Message-Id: <97d72e5f12c7e84f8506.62@*> (glob) |
|
793 | 789 | In-Reply-To: <patchbomb.60@*> (glob) |
|
794 | 790 | References: <patchbomb.60@*> (glob) |
|
795 | 791 | User-Agent: Mercurial-patchbomb/* (glob) |
|
796 | 792 | Date: Thu, 01 Jan 1970 00:01:02 +0000 |
|
797 | 793 | From: quux |
|
798 | 794 | To: foo |
|
799 | 795 | Cc: bar |
|
800 | 796 | |
|
801 | 797 | --===* (glob) |
|
802 | 798 | Content-Type: text/x-patch; charset="us-ascii" |
|
803 | 799 | MIME-Version: 1.0 |
|
804 | 800 | Content-Transfer-Encoding: 7bit |
|
805 | 801 | Content-Disposition: inline; filename=t2-2.patch |
|
806 | 802 | |
|
807 | 803 | # HG changeset patch |
|
808 | 804 | # User test |
|
809 | 805 | # Date 2 0 |
|
810 | 806 | # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
811 | 807 | # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
812 | 808 | b |
|
813 | 809 | |
|
814 | 810 | diff -r 8580ff50825a -r 97d72e5f12c7 b |
|
815 | 811 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
816 | 812 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
817 | 813 | @@ -0,0 +1,1 @@ |
|
818 | 814 | +b |
|
819 | 815 | |
|
820 | 816 | --===*-- (glob) |
|
821 | 817 | Displaying [PATCH 3 of 3] long line ... |
|
822 | 818 | Content-Type: multipart/mixed; boundary="===*" (glob) |
|
823 | 819 | MIME-Version: 1.0 |
|
824 | 820 | Subject: [PATCH 3 of 3] long line |
|
825 | 821 | X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 |
|
826 | 822 | Message-Id: <a2ea8fc83dd8b93cfd86.63@*> (glob) |
|
827 | 823 | In-Reply-To: <patchbomb.60@*> (glob) |
|
828 | 824 | References: <patchbomb.60@*> (glob) |
|
829 | 825 | User-Agent: Mercurial-patchbomb/* (glob) |
|
830 | 826 | Date: Thu, 01 Jan 1970 00:01:03 +0000 |
|
831 | 827 | From: quux |
|
832 | 828 | To: foo |
|
833 | 829 | Cc: bar |
|
834 | 830 | |
|
835 | 831 | --===* (glob) |
|
836 | 832 | Content-Type: text/x-patch; charset="us-ascii" |
|
837 | 833 | MIME-Version: 1.0 |
|
838 | 834 | Content-Transfer-Encoding: quoted-printable |
|
839 | 835 | Content-Disposition: inline; filename=t2-3.patch |
|
840 | 836 | |
|
841 | 837 | # HG changeset patch |
|
842 | 838 | # User test |
|
843 | 839 | # Date 4 0 |
|
844 | 840 | # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 |
|
845 | 841 | # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f |
|
846 | 842 | long line |
|
847 | 843 | |
|
848 | 844 | diff -r 909a00e13e9d -r a2ea8fc83dd8 long |
|
849 | 845 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
850 | 846 | +++ b/long Thu Jan 01 00:00:04 1970 +0000 |
|
851 | 847 | @@ -0,0 +1,4 @@ |
|
852 | 848 | +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
853 | 849 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
854 | 850 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
855 | 851 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
856 | 852 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
857 | 853 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
858 | 854 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
859 | 855 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
860 | 856 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
861 | 857 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
862 | 858 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
863 | 859 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
864 | 860 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
865 | 861 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx |
|
866 | 862 | +foo |
|
867 | 863 | + |
|
868 | 864 | +bar |
|
869 | 865 | |
|
870 | 866 | --===*-- (glob) |
|
871 | 867 | |
|
872 | 868 | test attach for single patch: |
|
873 | 869 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a -r 2 |
|
874 | 870 | This patch series consists of 1 patches. |
|
875 | 871 | |
|
876 | 872 | |
|
877 | 873 | Displaying [PATCH] test ... |
|
878 | 874 | Content-Type: multipart/mixed; boundary="===*" (glob) |
|
879 | 875 | MIME-Version: 1.0 |
|
880 | 876 | Subject: [PATCH] test |
|
881 | 877 | X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
882 | 878 | Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob) |
|
883 | 879 | User-Agent: Mercurial-patchbomb/* (glob) |
|
884 | 880 | Date: Thu, 01 Jan 1970 00:01:00 +0000 |
|
885 | 881 | From: quux |
|
886 | 882 | To: foo |
|
887 | 883 | Cc: bar |
|
888 | 884 | |
|
889 | 885 | --===* (glob) |
|
890 | 886 | Content-Type: text/plain; charset="us-ascii" |
|
891 | 887 | MIME-Version: 1.0 |
|
892 | 888 | Content-Transfer-Encoding: 7bit |
|
893 | 889 | |
|
894 | 890 | Patch subject is complete summary. |
|
895 | 891 | |
|
896 | 892 | |
|
897 | 893 | |
|
898 | 894 | --===* (glob) |
|
899 | 895 | Content-Type: text/x-patch; charset="us-ascii" |
|
900 | 896 | MIME-Version: 1.0 |
|
901 | 897 | Content-Transfer-Encoding: 7bit |
|
902 | 898 | Content-Disposition: attachment; filename=t2.patch |
|
903 | 899 | |
|
904 | 900 | # HG changeset patch |
|
905 | 901 | # User test |
|
906 | 902 | # Date 3 0 |
|
907 | 903 | # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
908 | 904 | # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
909 | 905 | c |
|
910 | 906 | |
|
911 | 907 | diff -r 97d72e5f12c7 -r ff2c9fa2018b c |
|
912 | 908 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
913 | 909 | +++ b/c Thu Jan 01 00:00:03 1970 +0000 |
|
914 | 910 | @@ -0,0 +1,1 @@ |
|
915 | 911 | +c |
|
916 | 912 | |
|
917 | 913 | --===*-- (glob) |
|
918 | 914 | |
|
919 | 915 | test attach for single patch (quoted-printable): |
|
920 | 916 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a -r 4 |
|
921 | 917 | This patch series consists of 1 patches. |
|
922 | 918 | |
|
923 | 919 | |
|
924 | 920 | Displaying [PATCH] test ... |
|
925 | 921 | Content-Type: multipart/mixed; boundary="===*" (glob) |
|
926 | 922 | MIME-Version: 1.0 |
|
927 | 923 | Subject: [PATCH] test |
|
928 | 924 | X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 |
|
929 | 925 | Message-Id: <a2ea8fc83dd8b93cfd86.60@*> (glob) |
|
930 | 926 | User-Agent: Mercurial-patchbomb/* (glob) |
|
931 | 927 | Date: Thu, 01 Jan 1970 00:01:00 +0000 |
|
932 | 928 | From: quux |
|
933 | 929 | To: foo |
|
934 | 930 | Cc: bar |
|
935 | 931 | |
|
936 | 932 | --===* (glob) |
|
937 | 933 | Content-Type: text/plain; charset="us-ascii" |
|
938 | 934 | MIME-Version: 1.0 |
|
939 | 935 | Content-Transfer-Encoding: 7bit |
|
940 | 936 | |
|
941 | 937 | Patch subject is complete summary. |
|
942 | 938 | |
|
943 | 939 | |
|
944 | 940 | |
|
945 | 941 | --===* (glob) |
|
946 | 942 | Content-Type: text/x-patch; charset="us-ascii" |
|
947 | 943 | MIME-Version: 1.0 |
|
948 | 944 | Content-Transfer-Encoding: quoted-printable |
|
949 | 945 | Content-Disposition: attachment; filename=t2.patch |
|
950 | 946 | |
|
951 | 947 | # HG changeset patch |
|
952 | 948 | # User test |
|
953 | 949 | # Date 4 0 |
|
954 | 950 | # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 |
|
955 | 951 | # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f |
|
956 | 952 | long line |
|
957 | 953 | |
|
958 | 954 | diff -r 909a00e13e9d -r a2ea8fc83dd8 long |
|
959 | 955 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
960 | 956 | +++ b/long Thu Jan 01 00:00:04 1970 +0000 |
|
961 | 957 | @@ -0,0 +1,4 @@ |
|
962 | 958 | +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
963 | 959 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
964 | 960 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
965 | 961 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
966 | 962 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
967 | 963 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
968 | 964 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
969 | 965 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
970 | 966 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
971 | 967 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
972 | 968 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
973 | 969 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
974 | 970 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
975 | 971 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx |
|
976 | 972 | +foo |
|
977 | 973 | + |
|
978 | 974 | +bar |
|
979 | 975 | |
|
980 | 976 | --===*-- (glob) |
|
981 | 977 | |
|
982 | 978 | test attach and body for single patch: |
|
983 | 979 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a --body -r 2 |
|
984 | 980 | This patch series consists of 1 patches. |
|
985 | 981 | |
|
986 | 982 | |
|
987 | 983 | Displaying [PATCH] test ... |
|
988 | 984 | Content-Type: multipart/mixed; boundary="===*" (glob) |
|
989 | 985 | MIME-Version: 1.0 |
|
990 | 986 | Subject: [PATCH] test |
|
991 | 987 | X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
992 | 988 | Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob) |
|
993 | 989 | User-Agent: Mercurial-patchbomb/* (glob) |
|
994 | 990 | Date: Thu, 01 Jan 1970 00:01:00 +0000 |
|
995 | 991 | From: quux |
|
996 | 992 | To: foo |
|
997 | 993 | Cc: bar |
|
998 | 994 | |
|
999 | 995 | --===* (glob) |
|
1000 | 996 | Content-Type: text/plain; charset="us-ascii" |
|
1001 | 997 | MIME-Version: 1.0 |
|
1002 | 998 | Content-Transfer-Encoding: 7bit |
|
1003 | 999 | |
|
1004 | 1000 | # HG changeset patch |
|
1005 | 1001 | # User test |
|
1006 | 1002 | # Date 3 0 |
|
1007 | 1003 | # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
1008 | 1004 | # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
1009 | 1005 | c |
|
1010 | 1006 | |
|
1011 | 1007 | diff -r 97d72e5f12c7 -r ff2c9fa2018b c |
|
1012 | 1008 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1013 | 1009 | +++ b/c Thu Jan 01 00:00:03 1970 +0000 |
|
1014 | 1010 | @@ -0,0 +1,1 @@ |
|
1015 | 1011 | +c |
|
1016 | 1012 | |
|
1017 | 1013 | --===* (glob) |
|
1018 | 1014 | Content-Type: text/x-patch; charset="us-ascii" |
|
1019 | 1015 | MIME-Version: 1.0 |
|
1020 | 1016 | Content-Transfer-Encoding: 7bit |
|
1021 | 1017 | Content-Disposition: attachment; filename=t2.patch |
|
1022 | 1018 | |
|
1023 | 1019 | # HG changeset patch |
|
1024 | 1020 | # User test |
|
1025 | 1021 | # Date 3 0 |
|
1026 | 1022 | # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
1027 | 1023 | # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
1028 | 1024 | c |
|
1029 | 1025 | |
|
1030 | 1026 | diff -r 97d72e5f12c7 -r ff2c9fa2018b c |
|
1031 | 1027 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1032 | 1028 | +++ b/c Thu Jan 01 00:00:03 1970 +0000 |
|
1033 | 1029 | @@ -0,0 +1,1 @@ |
|
1034 | 1030 | +c |
|
1035 | 1031 | |
|
1036 | 1032 | --===*-- (glob) |
|
1037 | 1033 | |
|
1038 | 1034 | test attach for multiple patches: |
|
1039 | 1035 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a \ |
|
1040 | 1036 | > -r 0:1 -r 4 |
|
1041 | 1037 | This patch series consists of 3 patches. |
|
1042 | 1038 | |
|
1043 | 1039 | |
|
1044 | 1040 | Write the introductory message for the patch series. |
|
1045 | 1041 | |
|
1046 | 1042 | |
|
1047 | 1043 | Displaying [PATCH 0 of 3] test ... |
|
1048 | 1044 | Content-Type: text/plain; charset="us-ascii" |
|
1049 | 1045 | MIME-Version: 1.0 |
|
1050 | 1046 | Content-Transfer-Encoding: 7bit |
|
1051 | 1047 | Subject: [PATCH 0 of 3] test |
|
1052 | 1048 | Message-Id: <patchbomb.60@*> (glob) |
|
1053 | 1049 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1054 | 1050 | Date: Thu, 01 Jan 1970 00:01:00 +0000 |
|
1055 | 1051 | From: quux |
|
1056 | 1052 | To: foo |
|
1057 | 1053 | Cc: bar |
|
1058 | 1054 | |
|
1059 | 1055 | |
|
1060 | 1056 | Displaying [PATCH 1 of 3] a ... |
|
1061 | 1057 | Content-Type: multipart/mixed; boundary="===*" (glob) |
|
1062 | 1058 | MIME-Version: 1.0 |
|
1063 | 1059 | Subject: [PATCH 1 of 3] a |
|
1064 | 1060 | X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
1065 | 1061 | Message-Id: <8580ff50825a50c8f716.61@*> (glob) |
|
1066 | 1062 | In-Reply-To: <patchbomb.60@*> (glob) |
|
1067 | 1063 | References: <patchbomb.60@*> (glob) |
|
1068 | 1064 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1069 | 1065 | Date: Thu, 01 Jan 1970 00:01:01 +0000 |
|
1070 | 1066 | From: quux |
|
1071 | 1067 | To: foo |
|
1072 | 1068 | Cc: bar |
|
1073 | 1069 | |
|
1074 | 1070 | --===* (glob) |
|
1075 | 1071 | Content-Type: text/plain; charset="us-ascii" |
|
1076 | 1072 | MIME-Version: 1.0 |
|
1077 | 1073 | Content-Transfer-Encoding: 7bit |
|
1078 | 1074 | |
|
1079 | 1075 | Patch subject is complete summary. |
|
1080 | 1076 | |
|
1081 | 1077 | |
|
1082 | 1078 | |
|
1083 | 1079 | --===* (glob) |
|
1084 | 1080 | Content-Type: text/x-patch; charset="us-ascii" |
|
1085 | 1081 | MIME-Version: 1.0 |
|
1086 | 1082 | Content-Transfer-Encoding: 7bit |
|
1087 | 1083 | Content-Disposition: attachment; filename=t2-1.patch |
|
1088 | 1084 | |
|
1089 | 1085 | # HG changeset patch |
|
1090 | 1086 | # User test |
|
1091 | 1087 | # Date 1 0 |
|
1092 | 1088 | # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
1093 | 1089 | # Parent 0000000000000000000000000000000000000000 |
|
1094 | 1090 | a |
|
1095 | 1091 | |
|
1096 | 1092 | diff -r 000000000000 -r 8580ff50825a a |
|
1097 | 1093 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1098 | 1094 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
1099 | 1095 | @@ -0,0 +1,1 @@ |
|
1100 | 1096 | +a |
|
1101 | 1097 | |
|
1102 | 1098 | --===*-- (glob) |
|
1103 | 1099 | Displaying [PATCH 2 of 3] b ... |
|
1104 | 1100 | Content-Type: multipart/mixed; boundary="===*" (glob) |
|
1105 | 1101 | MIME-Version: 1.0 |
|
1106 | 1102 | Subject: [PATCH 2 of 3] b |
|
1107 | 1103 | X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
1108 | 1104 | Message-Id: <97d72e5f12c7e84f8506.62@*> (glob) |
|
1109 | 1105 | In-Reply-To: <patchbomb.60@*> (glob) |
|
1110 | 1106 | References: <patchbomb.60@*> (glob) |
|
1111 | 1107 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1112 | 1108 | Date: Thu, 01 Jan 1970 00:01:02 +0000 |
|
1113 | 1109 | From: quux |
|
1114 | 1110 | To: foo |
|
1115 | 1111 | Cc: bar |
|
1116 | 1112 | |
|
1117 | 1113 | --===* (glob) |
|
1118 | 1114 | Content-Type: text/plain; charset="us-ascii" |
|
1119 | 1115 | MIME-Version: 1.0 |
|
1120 | 1116 | Content-Transfer-Encoding: 7bit |
|
1121 | 1117 | |
|
1122 | 1118 | Patch subject is complete summary. |
|
1123 | 1119 | |
|
1124 | 1120 | |
|
1125 | 1121 | |
|
1126 | 1122 | --===* (glob) |
|
1127 | 1123 | Content-Type: text/x-patch; charset="us-ascii" |
|
1128 | 1124 | MIME-Version: 1.0 |
|
1129 | 1125 | Content-Transfer-Encoding: 7bit |
|
1130 | 1126 | Content-Disposition: attachment; filename=t2-2.patch |
|
1131 | 1127 | |
|
1132 | 1128 | # HG changeset patch |
|
1133 | 1129 | # User test |
|
1134 | 1130 | # Date 2 0 |
|
1135 | 1131 | # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
1136 | 1132 | # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
1137 | 1133 | b |
|
1138 | 1134 | |
|
1139 | 1135 | diff -r 8580ff50825a -r 97d72e5f12c7 b |
|
1140 | 1136 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1141 | 1137 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
1142 | 1138 | @@ -0,0 +1,1 @@ |
|
1143 | 1139 | +b |
|
1144 | 1140 | |
|
1145 | 1141 | --===*-- (glob) |
|
1146 | 1142 | Displaying [PATCH 3 of 3] long line ... |
|
1147 | 1143 | Content-Type: multipart/mixed; boundary="===*" (glob) |
|
1148 | 1144 | MIME-Version: 1.0 |
|
1149 | 1145 | Subject: [PATCH 3 of 3] long line |
|
1150 | 1146 | X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 |
|
1151 | 1147 | Message-Id: <a2ea8fc83dd8b93cfd86.63@*> (glob) |
|
1152 | 1148 | In-Reply-To: <patchbomb.60@*> (glob) |
|
1153 | 1149 | References: <patchbomb.60@*> (glob) |
|
1154 | 1150 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1155 | 1151 | Date: Thu, 01 Jan 1970 00:01:03 +0000 |
|
1156 | 1152 | From: quux |
|
1157 | 1153 | To: foo |
|
1158 | 1154 | Cc: bar |
|
1159 | 1155 | |
|
1160 | 1156 | --===* (glob) |
|
1161 | 1157 | Content-Type: text/plain; charset="us-ascii" |
|
1162 | 1158 | MIME-Version: 1.0 |
|
1163 | 1159 | Content-Transfer-Encoding: 7bit |
|
1164 | 1160 | |
|
1165 | 1161 | Patch subject is complete summary. |
|
1166 | 1162 | |
|
1167 | 1163 | |
|
1168 | 1164 | |
|
1169 | 1165 | --===* (glob) |
|
1170 | 1166 | Content-Type: text/x-patch; charset="us-ascii" |
|
1171 | 1167 | MIME-Version: 1.0 |
|
1172 | 1168 | Content-Transfer-Encoding: quoted-printable |
|
1173 | 1169 | Content-Disposition: attachment; filename=t2-3.patch |
|
1174 | 1170 | |
|
1175 | 1171 | # HG changeset patch |
|
1176 | 1172 | # User test |
|
1177 | 1173 | # Date 4 0 |
|
1178 | 1174 | # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 |
|
1179 | 1175 | # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f |
|
1180 | 1176 | long line |
|
1181 | 1177 | |
|
1182 | 1178 | diff -r 909a00e13e9d -r a2ea8fc83dd8 long |
|
1183 | 1179 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1184 | 1180 | +++ b/long Thu Jan 01 00:00:04 1970 +0000 |
|
1185 | 1181 | @@ -0,0 +1,4 @@ |
|
1186 | 1182 | +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
1187 | 1183 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
1188 | 1184 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
1189 | 1185 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
1190 | 1186 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
1191 | 1187 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
1192 | 1188 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
1193 | 1189 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
1194 | 1190 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
1195 | 1191 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
1196 | 1192 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
1197 | 1193 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
1198 | 1194 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
1199 | 1195 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx |
|
1200 | 1196 | +foo |
|
1201 | 1197 | + |
|
1202 | 1198 | +bar |
|
1203 | 1199 | |
|
1204 | 1200 | --===*-- (glob) |
|
1205 | 1201 | |
|
1206 | 1202 | test intro for single patch: |
|
1207 | 1203 | $ hg email --date '1970-1-1 0:1' -n --intro -f quux -t foo -c bar -s test \ |
|
1208 | 1204 | > -r 2 |
|
1209 | 1205 | This patch series consists of 1 patches. |
|
1210 | 1206 | |
|
1211 | 1207 | |
|
1212 | 1208 | Write the introductory message for the patch series. |
|
1213 | 1209 | |
|
1214 | 1210 | |
|
1215 | 1211 | Displaying [PATCH 0 of 1] test ... |
|
1216 | 1212 | Content-Type: text/plain; charset="us-ascii" |
|
1217 | 1213 | MIME-Version: 1.0 |
|
1218 | 1214 | Content-Transfer-Encoding: 7bit |
|
1219 | 1215 | Subject: [PATCH 0 of 1] test |
|
1220 | 1216 | Message-Id: <patchbomb.60@*> (glob) |
|
1221 | 1217 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1222 | 1218 | Date: Thu, 01 Jan 1970 00:01:00 +0000 |
|
1223 | 1219 | From: quux |
|
1224 | 1220 | To: foo |
|
1225 | 1221 | Cc: bar |
|
1226 | 1222 | |
|
1227 | 1223 | |
|
1228 | 1224 | Displaying [PATCH 1 of 1] c ... |
|
1229 | 1225 | Content-Type: text/plain; charset="us-ascii" |
|
1230 | 1226 | MIME-Version: 1.0 |
|
1231 | 1227 | Content-Transfer-Encoding: 7bit |
|
1232 | 1228 | Subject: [PATCH 1 of 1] c |
|
1233 | 1229 | X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
1234 | 1230 | Message-Id: <ff2c9fa2018b15fa74b3.61@*> (glob) |
|
1235 | 1231 | In-Reply-To: <patchbomb.60@*> (glob) |
|
1236 | 1232 | References: <patchbomb.60@*> (glob) |
|
1237 | 1233 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1238 | 1234 | Date: Thu, 01 Jan 1970 00:01:01 +0000 |
|
1239 | 1235 | From: quux |
|
1240 | 1236 | To: foo |
|
1241 | 1237 | Cc: bar |
|
1242 | 1238 | |
|
1243 | 1239 | # HG changeset patch |
|
1244 | 1240 | # User test |
|
1245 | 1241 | # Date 3 0 |
|
1246 | 1242 | # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
1247 | 1243 | # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
1248 | 1244 | c |
|
1249 | 1245 | |
|
1250 | 1246 | diff -r 97d72e5f12c7 -r ff2c9fa2018b c |
|
1251 | 1247 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1252 | 1248 | +++ b/c Thu Jan 01 00:00:03 1970 +0000 |
|
1253 | 1249 | @@ -0,0 +1,1 @@ |
|
1254 | 1250 | +c |
|
1255 | 1251 | |
|
1256 | 1252 | |
|
1257 | 1253 | test --desc without --intro for a single patch: |
|
1258 | 1254 | $ echo foo > intro.text |
|
1259 | 1255 | $ hg email --date '1970-1-1 0:1' -n --desc intro.text -f quux -t foo -c bar \ |
|
1260 | 1256 | > -s test -r 2 |
|
1261 | 1257 | This patch series consists of 1 patches. |
|
1262 | 1258 | |
|
1263 | 1259 | |
|
1264 | 1260 | Displaying [PATCH 0 of 1] test ... |
|
1265 | 1261 | Content-Type: text/plain; charset="us-ascii" |
|
1266 | 1262 | MIME-Version: 1.0 |
|
1267 | 1263 | Content-Transfer-Encoding: 7bit |
|
1268 | 1264 | Subject: [PATCH 0 of 1] test |
|
1269 | 1265 | Message-Id: <patchbomb.60@*> (glob) |
|
1270 | 1266 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1271 | 1267 | Date: Thu, 01 Jan 1970 00:01:00 +0000 |
|
1272 | 1268 | From: quux |
|
1273 | 1269 | To: foo |
|
1274 | 1270 | Cc: bar |
|
1275 | 1271 | |
|
1276 | 1272 | foo |
|
1277 | 1273 | |
|
1278 | 1274 | Displaying [PATCH 1 of 1] c ... |
|
1279 | 1275 | Content-Type: text/plain; charset="us-ascii" |
|
1280 | 1276 | MIME-Version: 1.0 |
|
1281 | 1277 | Content-Transfer-Encoding: 7bit |
|
1282 | 1278 | Subject: [PATCH 1 of 1] c |
|
1283 | 1279 | X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
1284 | 1280 | Message-Id: <ff2c9fa2018b15fa74b3.61@*> (glob) |
|
1285 | 1281 | In-Reply-To: <patchbomb.60@*> (glob) |
|
1286 | 1282 | References: <patchbomb.60@*> (glob) |
|
1287 | 1283 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1288 | 1284 | Date: Thu, 01 Jan 1970 00:01:01 +0000 |
|
1289 | 1285 | From: quux |
|
1290 | 1286 | To: foo |
|
1291 | 1287 | Cc: bar |
|
1292 | 1288 | |
|
1293 | 1289 | # HG changeset patch |
|
1294 | 1290 | # User test |
|
1295 | 1291 | # Date 3 0 |
|
1296 | 1292 | # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
1297 | 1293 | # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
1298 | 1294 | c |
|
1299 | 1295 | |
|
1300 | 1296 | diff -r 97d72e5f12c7 -r ff2c9fa2018b c |
|
1301 | 1297 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1302 | 1298 | +++ b/c Thu Jan 01 00:00:03 1970 +0000 |
|
1303 | 1299 | @@ -0,0 +1,1 @@ |
|
1304 | 1300 | +c |
|
1305 | 1301 | |
|
1306 | 1302 | |
|
1307 | 1303 | test intro for multiple patches: |
|
1308 | 1304 | $ hg email --date '1970-1-1 0:1' -n --intro -f quux -t foo -c bar -s test \ |
|
1309 | 1305 | > -r 0:1 |
|
1310 | 1306 | This patch series consists of 2 patches. |
|
1311 | 1307 | |
|
1312 | 1308 | |
|
1313 | 1309 | Write the introductory message for the patch series. |
|
1314 | 1310 | |
|
1315 | 1311 | |
|
1316 | 1312 | Displaying [PATCH 0 of 2] test ... |
|
1317 | 1313 | Content-Type: text/plain; charset="us-ascii" |
|
1318 | 1314 | MIME-Version: 1.0 |
|
1319 | 1315 | Content-Transfer-Encoding: 7bit |
|
1320 | 1316 | Subject: [PATCH 0 of 2] test |
|
1321 | 1317 | Message-Id: <patchbomb.60@*> (glob) |
|
1322 | 1318 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1323 | 1319 | Date: Thu, 01 Jan 1970 00:01:00 +0000 |
|
1324 | 1320 | From: quux |
|
1325 | 1321 | To: foo |
|
1326 | 1322 | Cc: bar |
|
1327 | 1323 | |
|
1328 | 1324 | |
|
1329 | 1325 | Displaying [PATCH 1 of 2] a ... |
|
1330 | 1326 | Content-Type: text/plain; charset="us-ascii" |
|
1331 | 1327 | MIME-Version: 1.0 |
|
1332 | 1328 | Content-Transfer-Encoding: 7bit |
|
1333 | 1329 | Subject: [PATCH 1 of 2] a |
|
1334 | 1330 | X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
1335 | 1331 | Message-Id: <8580ff50825a50c8f716.61@*> (glob) |
|
1336 | 1332 | In-Reply-To: <patchbomb.60@*> (glob) |
|
1337 | 1333 | References: <patchbomb.60@*> (glob) |
|
1338 | 1334 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1339 | 1335 | Date: Thu, 01 Jan 1970 00:01:01 +0000 |
|
1340 | 1336 | From: quux |
|
1341 | 1337 | To: foo |
|
1342 | 1338 | Cc: bar |
|
1343 | 1339 | |
|
1344 | 1340 | # HG changeset patch |
|
1345 | 1341 | # User test |
|
1346 | 1342 | # Date 1 0 |
|
1347 | 1343 | # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
1348 | 1344 | # Parent 0000000000000000000000000000000000000000 |
|
1349 | 1345 | a |
|
1350 | 1346 | |
|
1351 | 1347 | diff -r 000000000000 -r 8580ff50825a a |
|
1352 | 1348 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1353 | 1349 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
1354 | 1350 | @@ -0,0 +1,1 @@ |
|
1355 | 1351 | +a |
|
1356 | 1352 | |
|
1357 | 1353 | Displaying [PATCH 2 of 2] b ... |
|
1358 | 1354 | Content-Type: text/plain; charset="us-ascii" |
|
1359 | 1355 | MIME-Version: 1.0 |
|
1360 | 1356 | Content-Transfer-Encoding: 7bit |
|
1361 | 1357 | Subject: [PATCH 2 of 2] b |
|
1362 | 1358 | X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
1363 | 1359 | Message-Id: <97d72e5f12c7e84f8506.62@*> (glob) |
|
1364 | 1360 | In-Reply-To: <patchbomb.60@*> (glob) |
|
1365 | 1361 | References: <patchbomb.60@*> (glob) |
|
1366 | 1362 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1367 | 1363 | Date: Thu, 01 Jan 1970 00:01:02 +0000 |
|
1368 | 1364 | From: quux |
|
1369 | 1365 | To: foo |
|
1370 | 1366 | Cc: bar |
|
1371 | 1367 | |
|
1372 | 1368 | # HG changeset patch |
|
1373 | 1369 | # User test |
|
1374 | 1370 | # Date 2 0 |
|
1375 | 1371 | # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
1376 | 1372 | # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
1377 | 1373 | b |
|
1378 | 1374 | |
|
1379 | 1375 | diff -r 8580ff50825a -r 97d72e5f12c7 b |
|
1380 | 1376 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1381 | 1377 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
1382 | 1378 | @@ -0,0 +1,1 @@ |
|
1383 | 1379 | +b |
|
1384 | 1380 | |
|
1385 | 1381 | |
|
1386 | 1382 | test reply-to via config: |
|
1387 | 1383 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -r 2 \ |
|
1388 | 1384 | > --config patchbomb.reply-to='baz@example.com' |
|
1389 | 1385 | This patch series consists of 1 patches. |
|
1390 | 1386 | |
|
1391 | 1387 | |
|
1392 | 1388 | Displaying [PATCH] test ... |
|
1393 | 1389 | Content-Type: text/plain; charset="us-ascii" |
|
1394 | 1390 | MIME-Version: 1.0 |
|
1395 | 1391 | Content-Transfer-Encoding: 7bit |
|
1396 | 1392 | Subject: [PATCH] test |
|
1397 | 1393 | X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
1398 | 1394 | Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob) |
|
1399 | 1395 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1400 | 1396 | Date: Thu, 01 Jan 1970 00:01:00 +0000 |
|
1401 | 1397 | From: quux |
|
1402 | 1398 | To: foo |
|
1403 | 1399 | Cc: bar |
|
1404 | 1400 | Reply-To: baz@example.com |
|
1405 | 1401 | |
|
1406 | 1402 | # HG changeset patch |
|
1407 | 1403 | # User test |
|
1408 | 1404 | # Date 3 0 |
|
1409 | 1405 | # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
1410 | 1406 | # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
1411 | 1407 | c |
|
1412 | 1408 | |
|
1413 | 1409 | diff -r 97d72e5f12c7 -r ff2c9fa2018b c |
|
1414 | 1410 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1415 | 1411 | +++ b/c Thu Jan 01 00:00:03 1970 +0000 |
|
1416 | 1412 | @@ -0,0 +1,1 @@ |
|
1417 | 1413 | +c |
|
1418 | 1414 | |
|
1419 | 1415 | |
|
1420 | 1416 | test reply-to via command line: |
|
1421 | 1417 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -r 2 \ |
|
1422 | 1418 | > --reply-to baz --reply-to fred |
|
1423 | 1419 | This patch series consists of 1 patches. |
|
1424 | 1420 | |
|
1425 | 1421 | |
|
1426 | 1422 | Displaying [PATCH] test ... |
|
1427 | 1423 | Content-Type: text/plain; charset="us-ascii" |
|
1428 | 1424 | MIME-Version: 1.0 |
|
1429 | 1425 | Content-Transfer-Encoding: 7bit |
|
1430 | 1426 | Subject: [PATCH] test |
|
1431 | 1427 | X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
1432 | 1428 | Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob) |
|
1433 | 1429 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1434 | 1430 | Date: Thu, 01 Jan 1970 00:01:00 +0000 |
|
1435 | 1431 | From: quux |
|
1436 | 1432 | To: foo |
|
1437 | 1433 | Cc: bar |
|
1438 | 1434 | Reply-To: baz, fred |
|
1439 | 1435 | |
|
1440 | 1436 | # HG changeset patch |
|
1441 | 1437 | # User test |
|
1442 | 1438 | # Date 3 0 |
|
1443 | 1439 | # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
1444 | 1440 | # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
1445 | 1441 | c |
|
1446 | 1442 | |
|
1447 | 1443 | diff -r 97d72e5f12c7 -r ff2c9fa2018b c |
|
1448 | 1444 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1449 | 1445 | +++ b/c Thu Jan 01 00:00:03 1970 +0000 |
|
1450 | 1446 | @@ -0,0 +1,1 @@ |
|
1451 | 1447 | +c |
|
1452 | 1448 | |
|
1453 | 1449 | |
|
1454 | 1450 | tagging csets: |
|
1455 | 1451 | $ hg tag -r0 zero zero.foo |
|
1456 | 1452 | $ hg tag -r1 one one.patch |
|
1457 | 1453 | $ hg tag -r2 two two.diff |
|
1458 | 1454 | |
|
1459 | 1455 | test inline for single named patch: |
|
1460 | 1456 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 2 |
|
1461 | 1457 | This patch series consists of 1 patches. |
|
1462 | 1458 | |
|
1463 | 1459 | |
|
1464 | 1460 | Displaying [PATCH] test ... |
|
1465 | 1461 | Content-Type: multipart/mixed; boundary="===*" (glob) |
|
1466 | 1462 | MIME-Version: 1.0 |
|
1467 | 1463 | Subject: [PATCH] test |
|
1468 | 1464 | X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
1469 | 1465 | Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob) |
|
1470 | 1466 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1471 | 1467 | Date: Thu, 01 Jan 1970 00:01:00 +0000 |
|
1472 | 1468 | From: quux |
|
1473 | 1469 | To: foo |
|
1474 | 1470 | Cc: bar |
|
1475 | 1471 | |
|
1476 | 1472 | --===* (glob) |
|
1477 | 1473 | Content-Type: text/x-patch; charset="us-ascii" |
|
1478 | 1474 | MIME-Version: 1.0 |
|
1479 | 1475 | Content-Transfer-Encoding: 7bit |
|
1480 | 1476 | Content-Disposition: inline; filename=two.diff |
|
1481 | 1477 | |
|
1482 | 1478 | # HG changeset patch |
|
1483 | 1479 | # User test |
|
1484 | 1480 | # Date 3 0 |
|
1485 | 1481 | # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
1486 | 1482 | # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
1487 | 1483 | c |
|
1488 | 1484 | |
|
1489 | 1485 | diff -r 97d72e5f12c7 -r ff2c9fa2018b c |
|
1490 | 1486 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1491 | 1487 | +++ b/c Thu Jan 01 00:00:03 1970 +0000 |
|
1492 | 1488 | @@ -0,0 +1,1 @@ |
|
1493 | 1489 | +c |
|
1494 | 1490 | |
|
1495 | 1491 | --===*-- (glob) |
|
1496 | 1492 | |
|
1497 | 1493 | test inline for multiple named/unnamed patches: |
|
1498 | 1494 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 0:1 |
|
1499 | 1495 | This patch series consists of 2 patches. |
|
1500 | 1496 | |
|
1501 | 1497 | |
|
1502 | 1498 | Write the introductory message for the patch series. |
|
1503 | 1499 | |
|
1504 | 1500 | |
|
1505 | 1501 | Displaying [PATCH 0 of 2] test ... |
|
1506 | 1502 | Content-Type: text/plain; charset="us-ascii" |
|
1507 | 1503 | MIME-Version: 1.0 |
|
1508 | 1504 | Content-Transfer-Encoding: 7bit |
|
1509 | 1505 | Subject: [PATCH 0 of 2] test |
|
1510 | 1506 | Message-Id: <patchbomb.60@*> (glob) |
|
1511 | 1507 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1512 | 1508 | Date: Thu, 01 Jan 1970 00:01:00 +0000 |
|
1513 | 1509 | From: quux |
|
1514 | 1510 | To: foo |
|
1515 | 1511 | Cc: bar |
|
1516 | 1512 | |
|
1517 | 1513 | |
|
1518 | 1514 | Displaying [PATCH 1 of 2] a ... |
|
1519 | 1515 | Content-Type: multipart/mixed; boundary="===*" (glob) |
|
1520 | 1516 | MIME-Version: 1.0 |
|
1521 | 1517 | Subject: [PATCH 1 of 2] a |
|
1522 | 1518 | X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
1523 | 1519 | Message-Id: <8580ff50825a50c8f716.61@*> (glob) |
|
1524 | 1520 | In-Reply-To: <patchbomb.60@*> (glob) |
|
1525 | 1521 | References: <patchbomb.60@*> (glob) |
|
1526 | 1522 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1527 | 1523 | Date: Thu, 01 Jan 1970 00:01:01 +0000 |
|
1528 | 1524 | From: quux |
|
1529 | 1525 | To: foo |
|
1530 | 1526 | Cc: bar |
|
1531 | 1527 | |
|
1532 | 1528 | --===* (glob) |
|
1533 | 1529 | Content-Type: text/x-patch; charset="us-ascii" |
|
1534 | 1530 | MIME-Version: 1.0 |
|
1535 | 1531 | Content-Transfer-Encoding: 7bit |
|
1536 | 1532 | Content-Disposition: inline; filename=t2-1.patch |
|
1537 | 1533 | |
|
1538 | 1534 | # HG changeset patch |
|
1539 | 1535 | # User test |
|
1540 | 1536 | # Date 1 0 |
|
1541 | 1537 | # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
1542 | 1538 | # Parent 0000000000000000000000000000000000000000 |
|
1543 | 1539 | a |
|
1544 | 1540 | |
|
1545 | 1541 | diff -r 000000000000 -r 8580ff50825a a |
|
1546 | 1542 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1547 | 1543 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
1548 | 1544 | @@ -0,0 +1,1 @@ |
|
1549 | 1545 | +a |
|
1550 | 1546 | |
|
1551 | 1547 | --===*-- (glob) |
|
1552 | 1548 | Displaying [PATCH 2 of 2] b ... |
|
1553 | 1549 | Content-Type: multipart/mixed; boundary="===*" (glob) |
|
1554 | 1550 | MIME-Version: 1.0 |
|
1555 | 1551 | Subject: [PATCH 2 of 2] b |
|
1556 | 1552 | X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
1557 | 1553 | Message-Id: <97d72e5f12c7e84f8506.62@*> (glob) |
|
1558 | 1554 | In-Reply-To: <patchbomb.60@*> (glob) |
|
1559 | 1555 | References: <patchbomb.60@*> (glob) |
|
1560 | 1556 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1561 | 1557 | Date: Thu, 01 Jan 1970 00:01:02 +0000 |
|
1562 | 1558 | From: quux |
|
1563 | 1559 | To: foo |
|
1564 | 1560 | Cc: bar |
|
1565 | 1561 | |
|
1566 | 1562 | --===* (glob) |
|
1567 | 1563 | Content-Type: text/x-patch; charset="us-ascii" |
|
1568 | 1564 | MIME-Version: 1.0 |
|
1569 | 1565 | Content-Transfer-Encoding: 7bit |
|
1570 | 1566 | Content-Disposition: inline; filename=one.patch |
|
1571 | 1567 | |
|
1572 | 1568 | # HG changeset patch |
|
1573 | 1569 | # User test |
|
1574 | 1570 | # Date 2 0 |
|
1575 | 1571 | # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
1576 | 1572 | # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
1577 | 1573 | b |
|
1578 | 1574 | |
|
1579 | 1575 | diff -r 8580ff50825a -r 97d72e5f12c7 b |
|
1580 | 1576 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1581 | 1577 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
1582 | 1578 | @@ -0,0 +1,1 @@ |
|
1583 | 1579 | +b |
|
1584 | 1580 | |
|
1585 | 1581 | --===*-- (glob) |
|
1586 | 1582 | |
|
1587 | 1583 | |
|
1588 | 1584 | test inreplyto: |
|
1589 | 1585 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar --in-reply-to baz \ |
|
1590 | 1586 | > -r tip |
|
1591 | 1587 | This patch series consists of 1 patches. |
|
1592 | 1588 | |
|
1593 | 1589 | |
|
1594 | 1590 | Displaying [PATCH] Added tag two, two.diff for changeset ff2c9fa2018b ... |
|
1595 | 1591 | Content-Type: text/plain; charset="us-ascii" |
|
1596 | 1592 | MIME-Version: 1.0 |
|
1597 | 1593 | Content-Transfer-Encoding: 7bit |
|
1598 | 1594 | Subject: [PATCH] Added tag two, two.diff for changeset ff2c9fa2018b |
|
1599 | 1595 | X-Mercurial-Node: 7aead2484924c445ad8ce2613df91f52f9e502ed |
|
1600 | 1596 | Message-Id: <7aead2484924c445ad8c.60@*> (glob) |
|
1601 | 1597 | In-Reply-To: <baz> |
|
1602 | 1598 | References: <baz> |
|
1603 | 1599 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1604 | 1600 | Date: Thu, 01 Jan 1970 00:01:00 +0000 |
|
1605 | 1601 | From: quux |
|
1606 | 1602 | To: foo |
|
1607 | 1603 | Cc: bar |
|
1608 | 1604 | |
|
1609 | 1605 | # HG changeset patch |
|
1610 | 1606 | # User test |
|
1611 | 1607 | # Date 0 0 |
|
1612 | 1608 | # Node ID 7aead2484924c445ad8ce2613df91f52f9e502ed |
|
1613 | 1609 | # Parent 045ca29b1ea20e4940411e695e20e521f2f0f98e |
|
1614 | 1610 | Added tag two, two.diff for changeset ff2c9fa2018b |
|
1615 | 1611 | |
|
1616 | 1612 | diff -r 045ca29b1ea2 -r 7aead2484924 .hgtags |
|
1617 | 1613 | --- a/.hgtags Thu Jan 01 00:00:00 1970 +0000 |
|
1618 | 1614 | +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000 |
|
1619 | 1615 | @@ -2,3 +2,5 @@ |
|
1620 | 1616 | 8580ff50825a50c8f716709acdf8de0deddcd6ab zero.foo |
|
1621 | 1617 | 97d72e5f12c7e84f85064aa72e5a297142c36ed9 one |
|
1622 | 1618 | 97d72e5f12c7e84f85064aa72e5a297142c36ed9 one.patch |
|
1623 | 1619 | +ff2c9fa2018b15fa74b33363bda9527323e2a99f two |
|
1624 | 1620 | +ff2c9fa2018b15fa74b33363bda9527323e2a99f two.diff |
|
1625 | 1621 | |
|
1626 | 1622 | no intro message in non-interactive mode |
|
1627 | 1623 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar --in-reply-to baz \ |
|
1628 | 1624 | > -r 0:1 |
|
1629 | 1625 | This patch series consists of 2 patches. |
|
1630 | 1626 | |
|
1631 | 1627 | (optional) Subject: [PATCH 0 of 2] |
|
1632 | 1628 | |
|
1633 | 1629 | Displaying [PATCH 1 of 2] a ... |
|
1634 | 1630 | Content-Type: text/plain; charset="us-ascii" |
|
1635 | 1631 | MIME-Version: 1.0 |
|
1636 | 1632 | Content-Transfer-Encoding: 7bit |
|
1637 | 1633 | Subject: [PATCH 1 of 2] a |
|
1638 | 1634 | X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
1639 | 1635 | Message-Id: <8580ff50825a50c8f716.60@*> (glob) |
|
1640 | 1636 | In-Reply-To: <baz> |
|
1641 | 1637 | References: <baz> |
|
1642 | 1638 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1643 | 1639 | Date: Thu, 01 Jan 1970 00:01:00 +0000 |
|
1644 | 1640 | From: quux |
|
1645 | 1641 | To: foo |
|
1646 | 1642 | Cc: bar |
|
1647 | 1643 | |
|
1648 | 1644 | # HG changeset patch |
|
1649 | 1645 | # User test |
|
1650 | 1646 | # Date 1 0 |
|
1651 | 1647 | # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
1652 | 1648 | # Parent 0000000000000000000000000000000000000000 |
|
1653 | 1649 | a |
|
1654 | 1650 | |
|
1655 | 1651 | diff -r 000000000000 -r 8580ff50825a a |
|
1656 | 1652 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1657 | 1653 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
1658 | 1654 | @@ -0,0 +1,1 @@ |
|
1659 | 1655 | +a |
|
1660 | 1656 | |
|
1661 | 1657 | Displaying [PATCH 2 of 2] b ... |
|
1662 | 1658 | Content-Type: text/plain; charset="us-ascii" |
|
1663 | 1659 | MIME-Version: 1.0 |
|
1664 | 1660 | Content-Transfer-Encoding: 7bit |
|
1665 | 1661 | Subject: [PATCH 2 of 2] b |
|
1666 | 1662 | X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
1667 | 1663 | Message-Id: <97d72e5f12c7e84f8506.61@*> (glob) |
|
1668 | 1664 | In-Reply-To: <8580ff50825a50c8f716.60@*> (glob) |
|
1669 | 1665 | References: <8580ff50825a50c8f716.60@*> (glob) |
|
1670 | 1666 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1671 | 1667 | Date: Thu, 01 Jan 1970 00:01:01 +0000 |
|
1672 | 1668 | From: quux |
|
1673 | 1669 | To: foo |
|
1674 | 1670 | Cc: bar |
|
1675 | 1671 | |
|
1676 | 1672 | # HG changeset patch |
|
1677 | 1673 | # User test |
|
1678 | 1674 | # Date 2 0 |
|
1679 | 1675 | # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
1680 | 1676 | # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
1681 | 1677 | b |
|
1682 | 1678 | |
|
1683 | 1679 | diff -r 8580ff50825a -r 97d72e5f12c7 b |
|
1684 | 1680 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1685 | 1681 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
1686 | 1682 | @@ -0,0 +1,1 @@ |
|
1687 | 1683 | +b |
|
1688 | 1684 | |
|
1689 | 1685 | |
|
1690 | 1686 | |
|
1691 | 1687 | |
|
1692 | 1688 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar --in-reply-to baz \ |
|
1693 | 1689 | > -s test -r 0:1 |
|
1694 | 1690 | This patch series consists of 2 patches. |
|
1695 | 1691 | |
|
1696 | 1692 | |
|
1697 | 1693 | Write the introductory message for the patch series. |
|
1698 | 1694 | |
|
1699 | 1695 | |
|
1700 | 1696 | Displaying [PATCH 0 of 2] test ... |
|
1701 | 1697 | Content-Type: text/plain; charset="us-ascii" |
|
1702 | 1698 | MIME-Version: 1.0 |
|
1703 | 1699 | Content-Transfer-Encoding: 7bit |
|
1704 | 1700 | Subject: [PATCH 0 of 2] test |
|
1705 | 1701 | Message-Id: <patchbomb.60@*> (glob) |
|
1706 | 1702 | In-Reply-To: <baz> |
|
1707 | 1703 | References: <baz> |
|
1708 | 1704 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1709 | 1705 | Date: Thu, 01 Jan 1970 00:01:00 +0000 |
|
1710 | 1706 | From: quux |
|
1711 | 1707 | To: foo |
|
1712 | 1708 | Cc: bar |
|
1713 | 1709 | |
|
1714 | 1710 | |
|
1715 | 1711 | Displaying [PATCH 1 of 2] a ... |
|
1716 | 1712 | Content-Type: text/plain; charset="us-ascii" |
|
1717 | 1713 | MIME-Version: 1.0 |
|
1718 | 1714 | Content-Transfer-Encoding: 7bit |
|
1719 | 1715 | Subject: [PATCH 1 of 2] a |
|
1720 | 1716 | X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
1721 | 1717 | Message-Id: <8580ff50825a50c8f716.61@*> (glob) |
|
1722 | 1718 | In-Reply-To: <patchbomb.60@*> (glob) |
|
1723 | 1719 | References: <patchbomb.60@*> (glob) |
|
1724 | 1720 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1725 | 1721 | Date: Thu, 01 Jan 1970 00:01:01 +0000 |
|
1726 | 1722 | From: quux |
|
1727 | 1723 | To: foo |
|
1728 | 1724 | Cc: bar |
|
1729 | 1725 | |
|
1730 | 1726 | # HG changeset patch |
|
1731 | 1727 | # User test |
|
1732 | 1728 | # Date 1 0 |
|
1733 | 1729 | # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
1734 | 1730 | # Parent 0000000000000000000000000000000000000000 |
|
1735 | 1731 | a |
|
1736 | 1732 | |
|
1737 | 1733 | diff -r 000000000000 -r 8580ff50825a a |
|
1738 | 1734 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1739 | 1735 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
1740 | 1736 | @@ -0,0 +1,1 @@ |
|
1741 | 1737 | +a |
|
1742 | 1738 | |
|
1743 | 1739 | Displaying [PATCH 2 of 2] b ... |
|
1744 | 1740 | Content-Type: text/plain; charset="us-ascii" |
|
1745 | 1741 | MIME-Version: 1.0 |
|
1746 | 1742 | Content-Transfer-Encoding: 7bit |
|
1747 | 1743 | Subject: [PATCH 2 of 2] b |
|
1748 | 1744 | X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
1749 | 1745 | Message-Id: <97d72e5f12c7e84f8506.62@*> (glob) |
|
1750 | 1746 | In-Reply-To: <patchbomb.60@*> (glob) |
|
1751 | 1747 | References: <patchbomb.60@*> (glob) |
|
1752 | 1748 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1753 | 1749 | Date: Thu, 01 Jan 1970 00:01:02 +0000 |
|
1754 | 1750 | From: quux |
|
1755 | 1751 | To: foo |
|
1756 | 1752 | Cc: bar |
|
1757 | 1753 | |
|
1758 | 1754 | # HG changeset patch |
|
1759 | 1755 | # User test |
|
1760 | 1756 | # Date 2 0 |
|
1761 | 1757 | # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
1762 | 1758 | # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
1763 | 1759 | b |
|
1764 | 1760 | |
|
1765 | 1761 | diff -r 8580ff50825a -r 97d72e5f12c7 b |
|
1766 | 1762 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1767 | 1763 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
1768 | 1764 | @@ -0,0 +1,1 @@ |
|
1769 | 1765 | +b |
|
1770 | 1766 | |
|
1771 | 1767 | |
|
1772 | 1768 | test single flag for single patch: |
|
1773 | 1769 | $ hg email --date '1970-1-1 0:1' -n --flag fooFlag -f quux -t foo -c bar -s test \ |
|
1774 | 1770 | > -r 2 |
|
1775 | 1771 | This patch series consists of 1 patches. |
|
1776 | 1772 | |
|
1777 | 1773 | |
|
1778 | 1774 | Displaying [PATCH fooFlag] test ... |
|
1779 | 1775 | Content-Type: text/plain; charset="us-ascii" |
|
1780 | 1776 | MIME-Version: 1.0 |
|
1781 | 1777 | Content-Transfer-Encoding: 7bit |
|
1782 | 1778 | Subject: [PATCH fooFlag] test |
|
1783 | 1779 | X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
1784 | 1780 | Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob) |
|
1785 | 1781 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1786 | 1782 | Date: Thu, 01 Jan 1970 00:01:00 +0000 |
|
1787 | 1783 | From: quux |
|
1788 | 1784 | To: foo |
|
1789 | 1785 | Cc: bar |
|
1790 | 1786 | |
|
1791 | 1787 | # HG changeset patch |
|
1792 | 1788 | # User test |
|
1793 | 1789 | # Date 3 0 |
|
1794 | 1790 | # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
1795 | 1791 | # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
1796 | 1792 | c |
|
1797 | 1793 | |
|
1798 | 1794 | diff -r 97d72e5f12c7 -r ff2c9fa2018b c |
|
1799 | 1795 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1800 | 1796 | +++ b/c Thu Jan 01 00:00:03 1970 +0000 |
|
1801 | 1797 | @@ -0,0 +1,1 @@ |
|
1802 | 1798 | +c |
|
1803 | 1799 | |
|
1804 | 1800 | |
|
1805 | 1801 | test single flag for multiple patches: |
|
1806 | 1802 | $ hg email --date '1970-1-1 0:1' -n --flag fooFlag -f quux -t foo -c bar -s test \ |
|
1807 | 1803 | > -r 0:1 |
|
1808 | 1804 | This patch series consists of 2 patches. |
|
1809 | 1805 | |
|
1810 | 1806 | |
|
1811 | 1807 | Write the introductory message for the patch series. |
|
1812 | 1808 | |
|
1813 | 1809 | |
|
1814 | 1810 | Displaying [PATCH 0 of 2 fooFlag] test ... |
|
1815 | 1811 | Content-Type: text/plain; charset="us-ascii" |
|
1816 | 1812 | MIME-Version: 1.0 |
|
1817 | 1813 | Content-Transfer-Encoding: 7bit |
|
1818 | 1814 | Subject: [PATCH 0 of 2 fooFlag] test |
|
1819 | 1815 | Message-Id: <patchbomb.60@*> (glob) |
|
1820 | 1816 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1821 | 1817 | Date: Thu, 01 Jan 1970 00:01:00 +0000 |
|
1822 | 1818 | From: quux |
|
1823 | 1819 | To: foo |
|
1824 | 1820 | Cc: bar |
|
1825 | 1821 | |
|
1826 | 1822 | |
|
1827 | 1823 | Displaying [PATCH 1 of 2 fooFlag] a ... |
|
1828 | 1824 | Content-Type: text/plain; charset="us-ascii" |
|
1829 | 1825 | MIME-Version: 1.0 |
|
1830 | 1826 | Content-Transfer-Encoding: 7bit |
|
1831 | 1827 | Subject: [PATCH 1 of 2 fooFlag] a |
|
1832 | 1828 | X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
1833 | 1829 | Message-Id: <8580ff50825a50c8f716.61@*> (glob) |
|
1834 | 1830 | In-Reply-To: <patchbomb.60@*> (glob) |
|
1835 | 1831 | References: <patchbomb.60@*> (glob) |
|
1836 | 1832 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1837 | 1833 | Date: Thu, 01 Jan 1970 00:01:01 +0000 |
|
1838 | 1834 | From: quux |
|
1839 | 1835 | To: foo |
|
1840 | 1836 | Cc: bar |
|
1841 | 1837 | |
|
1842 | 1838 | # HG changeset patch |
|
1843 | 1839 | # User test |
|
1844 | 1840 | # Date 1 0 |
|
1845 | 1841 | # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
1846 | 1842 | # Parent 0000000000000000000000000000000000000000 |
|
1847 | 1843 | a |
|
1848 | 1844 | |
|
1849 | 1845 | diff -r 000000000000 -r 8580ff50825a a |
|
1850 | 1846 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1851 | 1847 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
1852 | 1848 | @@ -0,0 +1,1 @@ |
|
1853 | 1849 | +a |
|
1854 | 1850 | |
|
1855 | 1851 | Displaying [PATCH 2 of 2 fooFlag] b ... |
|
1856 | 1852 | Content-Type: text/plain; charset="us-ascii" |
|
1857 | 1853 | MIME-Version: 1.0 |
|
1858 | 1854 | Content-Transfer-Encoding: 7bit |
|
1859 | 1855 | Subject: [PATCH 2 of 2 fooFlag] b |
|
1860 | 1856 | X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
1861 | 1857 | Message-Id: <97d72e5f12c7e84f8506.62@*> (glob) |
|
1862 | 1858 | In-Reply-To: <patchbomb.60@*> (glob) |
|
1863 | 1859 | References: <patchbomb.60@*> (glob) |
|
1864 | 1860 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1865 | 1861 | Date: Thu, 01 Jan 1970 00:01:02 +0000 |
|
1866 | 1862 | From: quux |
|
1867 | 1863 | To: foo |
|
1868 | 1864 | Cc: bar |
|
1869 | 1865 | |
|
1870 | 1866 | # HG changeset patch |
|
1871 | 1867 | # User test |
|
1872 | 1868 | # Date 2 0 |
|
1873 | 1869 | # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
1874 | 1870 | # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
1875 | 1871 | b |
|
1876 | 1872 | |
|
1877 | 1873 | diff -r 8580ff50825a -r 97d72e5f12c7 b |
|
1878 | 1874 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1879 | 1875 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
1880 | 1876 | @@ -0,0 +1,1 @@ |
|
1881 | 1877 | +b |
|
1882 | 1878 | |
|
1883 | 1879 | |
|
1884 | 1880 | test mutiple flags for single patch: |
|
1885 | 1881 | $ hg email --date '1970-1-1 0:1' -n --flag fooFlag --flag barFlag -f quux -t foo \ |
|
1886 | 1882 | > -c bar -s test -r 2 |
|
1887 | 1883 | This patch series consists of 1 patches. |
|
1888 | 1884 | |
|
1889 | 1885 | |
|
1890 | 1886 | Displaying [PATCH fooFlag barFlag] test ... |
|
1891 | 1887 | Content-Type: text/plain; charset="us-ascii" |
|
1892 | 1888 | MIME-Version: 1.0 |
|
1893 | 1889 | Content-Transfer-Encoding: 7bit |
|
1894 | 1890 | Subject: [PATCH fooFlag barFlag] test |
|
1895 | 1891 | X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
1896 | 1892 | Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob) |
|
1897 | 1893 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1898 | 1894 | Date: Thu, 01 Jan 1970 00:01:00 +0000 |
|
1899 | 1895 | From: quux |
|
1900 | 1896 | To: foo |
|
1901 | 1897 | Cc: bar |
|
1902 | 1898 | |
|
1903 | 1899 | # HG changeset patch |
|
1904 | 1900 | # User test |
|
1905 | 1901 | # Date 3 0 |
|
1906 | 1902 | # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
1907 | 1903 | # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
1908 | 1904 | c |
|
1909 | 1905 | |
|
1910 | 1906 | diff -r 97d72e5f12c7 -r ff2c9fa2018b c |
|
1911 | 1907 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1912 | 1908 | +++ b/c Thu Jan 01 00:00:03 1970 +0000 |
|
1913 | 1909 | @@ -0,0 +1,1 @@ |
|
1914 | 1910 | +c |
|
1915 | 1911 | |
|
1916 | 1912 | |
|
1917 | 1913 | test multiple flags for multiple patches: |
|
1918 | 1914 | $ hg email --date '1970-1-1 0:1' -n --flag fooFlag --flag barFlag -f quux -t foo \ |
|
1919 | 1915 | > -c bar -s test -r 0:1 |
|
1920 | 1916 | This patch series consists of 2 patches. |
|
1921 | 1917 | |
|
1922 | 1918 | |
|
1923 | 1919 | Write the introductory message for the patch series. |
|
1924 | 1920 | |
|
1925 | 1921 | |
|
1926 | 1922 | Displaying [PATCH 0 of 2 fooFlag barFlag] test ... |
|
1927 | 1923 | Content-Type: text/plain; charset="us-ascii" |
|
1928 | 1924 | MIME-Version: 1.0 |
|
1929 | 1925 | Content-Transfer-Encoding: 7bit |
|
1930 | 1926 | Subject: [PATCH 0 of 2 fooFlag barFlag] test |
|
1931 | 1927 | Message-Id: <patchbomb.60@*> (glob) |
|
1932 | 1928 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1933 | 1929 | Date: Thu, 01 Jan 1970 00:01:00 +0000 |
|
1934 | 1930 | From: quux |
|
1935 | 1931 | To: foo |
|
1936 | 1932 | Cc: bar |
|
1937 | 1933 | |
|
1938 | 1934 | |
|
1939 | 1935 | Displaying [PATCH 1 of 2 fooFlag barFlag] a ... |
|
1940 | 1936 | Content-Type: text/plain; charset="us-ascii" |
|
1941 | 1937 | MIME-Version: 1.0 |
|
1942 | 1938 | Content-Transfer-Encoding: 7bit |
|
1943 | 1939 | Subject: [PATCH 1 of 2 fooFlag barFlag] a |
|
1944 | 1940 | X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
1945 | 1941 | Message-Id: <8580ff50825a50c8f716.61@*> (glob) |
|
1946 | 1942 | In-Reply-To: <patchbomb.60@*> (glob) |
|
1947 | 1943 | References: <patchbomb.60@*> (glob) |
|
1948 | 1944 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1949 | 1945 | Date: Thu, 01 Jan 1970 00:01:01 +0000 |
|
1950 | 1946 | From: quux |
|
1951 | 1947 | To: foo |
|
1952 | 1948 | Cc: bar |
|
1953 | 1949 | |
|
1954 | 1950 | # HG changeset patch |
|
1955 | 1951 | # User test |
|
1956 | 1952 | # Date 1 0 |
|
1957 | 1953 | # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
1958 | 1954 | # Parent 0000000000000000000000000000000000000000 |
|
1959 | 1955 | a |
|
1960 | 1956 | |
|
1961 | 1957 | diff -r 000000000000 -r 8580ff50825a a |
|
1962 | 1958 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1963 | 1959 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
1964 | 1960 | @@ -0,0 +1,1 @@ |
|
1965 | 1961 | +a |
|
1966 | 1962 | |
|
1967 | 1963 | Displaying [PATCH 2 of 2 fooFlag barFlag] b ... |
|
1968 | 1964 | Content-Type: text/plain; charset="us-ascii" |
|
1969 | 1965 | MIME-Version: 1.0 |
|
1970 | 1966 | Content-Transfer-Encoding: 7bit |
|
1971 | 1967 | Subject: [PATCH 2 of 2 fooFlag barFlag] b |
|
1972 | 1968 | X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
1973 | 1969 | Message-Id: <97d72e5f12c7e84f8506.62@*> (glob) |
|
1974 | 1970 | In-Reply-To: <patchbomb.60@*> (glob) |
|
1975 | 1971 | References: <patchbomb.60@*> (glob) |
|
1976 | 1972 | User-Agent: Mercurial-patchbomb/* (glob) |
|
1977 | 1973 | Date: Thu, 01 Jan 1970 00:01:02 +0000 |
|
1978 | 1974 | From: quux |
|
1979 | 1975 | To: foo |
|
1980 | 1976 | Cc: bar |
|
1981 | 1977 | |
|
1982 | 1978 | # HG changeset patch |
|
1983 | 1979 | # User test |
|
1984 | 1980 | # Date 2 0 |
|
1985 | 1981 | # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
1986 | 1982 | # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
1987 | 1983 | b |
|
1988 | 1984 | |
|
1989 | 1985 | diff -r 8580ff50825a -r 97d72e5f12c7 b |
|
1990 | 1986 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1991 | 1987 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
1992 | 1988 | @@ -0,0 +1,1 @@ |
|
1993 | 1989 | +b |
|
1994 | 1990 | |
|
1995 | 1991 | |
|
1996 | 1992 | test multi-address parsing: |
|
1997 | 1993 | $ hg email --date '1980-1-1 0:1' -m tmp.mbox -f quux -t 'spam<spam><eggs>' \ |
|
1998 | 1994 | > -t toast -c 'foo,bar@example.com' -c '"A, B <>" <a@example.com>' -s test -r 0 \ |
|
1999 | 1995 | > --config email.bcc='"Quux, A." <quux>' |
|
2000 | 1996 | This patch series consists of 1 patches. |
|
2001 | 1997 | |
|
2002 | 1998 | |
|
2003 | 1999 | Sending [PATCH] test ... |
|
2004 | 2000 | $ cat < tmp.mbox |
|
2005 | 2001 | From quux ... ... .. ..:..:.. .... (re) |
|
2006 | 2002 | Content-Type: text/plain; charset="us-ascii" |
|
2007 | 2003 | MIME-Version: 1.0 |
|
2008 | 2004 | Content-Transfer-Encoding: 7bit |
|
2009 | 2005 | Subject: [PATCH] test |
|
2010 | 2006 | X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
2011 | 2007 | Message-Id: <8580ff50825a50c8f716.315532860@*> (glob) |
|
2012 | 2008 | User-Agent: Mercurial-patchbomb/* (glob) |
|
2013 | 2009 | Date: Tue, 01 Jan 1980 00:01:00 +0000 |
|
2014 | 2010 | From: quux |
|
2015 | 2011 | To: spam <spam>, eggs, toast |
|
2016 | 2012 | Cc: foo, bar@example.com, "A, B <>" <a@example.com> |
|
2017 | 2013 | Bcc: "Quux, A." <quux> |
|
2018 | 2014 | |
|
2019 | 2015 | # HG changeset patch |
|
2020 | 2016 | # User test |
|
2021 | 2017 | # Date 1 0 |
|
2022 | 2018 | # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
2023 | 2019 | # Parent 0000000000000000000000000000000000000000 |
|
2024 | 2020 | a |
|
2025 | 2021 | |
|
2026 | 2022 | diff -r 000000000000 -r 8580ff50825a a |
|
2027 | 2023 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2028 | 2024 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
2029 | 2025 | @@ -0,0 +1,1 @@ |
|
2030 | 2026 | +a |
|
2031 | 2027 | |
|
2032 | 2028 | |
|
2033 | 2029 | |
|
2034 | 2030 | test multi-byte domain parsing: |
|
2035 | 2031 | $ UUML=`python -c 'import sys; sys.stdout.write("\374")'` |
|
2036 | 2032 | $ HGENCODING=iso-8859-1 |
|
2037 | 2033 | $ export HGENCODING |
|
2038 | 2034 | $ hg email --date '1980-1-1 0:1' -m tmp.mbox -f quux -t "bar@${UUML}nicode.com" -s test -r 0 |
|
2039 | 2035 | This patch series consists of 1 patches. |
|
2040 | 2036 | |
|
2041 | 2037 | Cc: |
|
2042 | 2038 | |
|
2043 | 2039 | Sending [PATCH] test ... |
|
2044 | 2040 | |
|
2045 | 2041 | $ cat tmp.mbox |
|
2046 | 2042 | From quux ... ... .. ..:..:.. .... (re) |
|
2047 | 2043 | Content-Type: text/plain; charset="us-ascii" |
|
2048 | 2044 | MIME-Version: 1.0 |
|
2049 | 2045 | Content-Transfer-Encoding: 7bit |
|
2050 | 2046 | Subject: [PATCH] test |
|
2051 | 2047 | X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
2052 | 2048 | Message-Id: <8580ff50825a50c8f716.315532860@*> (glob) |
|
2053 | 2049 | User-Agent: Mercurial-patchbomb/* (glob) |
|
2054 | 2050 | Date: Tue, 01 Jan 1980 00:01:00 +0000 |
|
2055 | 2051 | From: quux |
|
2056 | 2052 | To: bar@xn--nicode-2ya.com |
|
2057 | 2053 | |
|
2058 | 2054 | # HG changeset patch |
|
2059 | 2055 | # User test |
|
2060 | 2056 | # Date 1 0 |
|
2061 | 2057 | # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
2062 | 2058 | # Parent 0000000000000000000000000000000000000000 |
|
2063 | 2059 | a |
|
2064 | 2060 | |
|
2065 | 2061 | diff -r 000000000000 -r 8580ff50825a a |
|
2066 | 2062 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2067 | 2063 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
2068 | 2064 | @@ -0,0 +1,1 @@ |
|
2069 | 2065 | +a |
|
2070 | 2066 | |
|
2071 | 2067 | |
|
2072 | 2068 | |
|
2073 | 2069 | test outgoing: |
|
2074 | 2070 | $ hg up 1 |
|
2075 | 2071 | 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
|
2076 | 2072 | |
|
2077 | 2073 | $ hg branch test |
|
2078 | 2074 | marked working directory as branch test |
|
2079 | 2075 | (branches are permanent and global, did you want a bookmark?) |
|
2080 | 2076 | |
|
2081 | 2077 | $ echo d > d |
|
2082 | 2078 | $ hg add d |
|
2083 | 2079 | $ hg ci -md -d '4 0' |
|
2084 | 2080 | $ hg email --date '1980-1-1 0:1' -n -t foo -s test -o ../t |
|
2085 | 2081 | comparing with ../t |
|
2086 | 2082 | searching for changes |
|
2087 | 2083 | From [test]: test |
|
2088 | 2084 | This patch series consists of 8 patches. |
|
2089 | 2085 | |
|
2090 | 2086 | |
|
2091 | 2087 | Write the introductory message for the patch series. |
|
2092 | 2088 | |
|
2093 | 2089 | Cc: |
|
2094 | 2090 | |
|
2095 | 2091 | Displaying [PATCH 0 of 8] test ... |
|
2096 | 2092 | Content-Type: text/plain; charset="us-ascii" |
|
2097 | 2093 | MIME-Version: 1.0 |
|
2098 | 2094 | Content-Transfer-Encoding: 7bit |
|
2099 | 2095 | Subject: [PATCH 0 of 8] test |
|
2100 | 2096 | Message-Id: <patchbomb.315532860@*> (glob) |
|
2101 | 2097 | User-Agent: Mercurial-patchbomb/* (glob) |
|
2102 | 2098 | Date: Tue, 01 Jan 1980 00:01:00 +0000 |
|
2103 | 2099 | From: test |
|
2104 | 2100 | To: foo |
|
2105 | 2101 | |
|
2106 | 2102 | |
|
2107 | 2103 | Displaying [PATCH 1 of 8] c ... |
|
2108 | 2104 | Content-Type: text/plain; charset="us-ascii" |
|
2109 | 2105 | MIME-Version: 1.0 |
|
2110 | 2106 | Content-Transfer-Encoding: 7bit |
|
2111 | 2107 | Subject: [PATCH 1 of 8] c |
|
2112 | 2108 | X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
2113 | 2109 | Message-Id: <ff2c9fa2018b15fa74b3.315532861@*> (glob) |
|
2114 | 2110 | In-Reply-To: <patchbomb.315532860@*> (glob) |
|
2115 | 2111 | References: <patchbomb.315532860@*> (glob) |
|
2116 | 2112 | User-Agent: Mercurial-patchbomb/* (glob) |
|
2117 | 2113 | Date: Tue, 01 Jan 1980 00:01:01 +0000 |
|
2118 | 2114 | From: test |
|
2119 | 2115 | To: foo |
|
2120 | 2116 | |
|
2121 | 2117 | # HG changeset patch |
|
2122 | 2118 | # User test |
|
2123 | 2119 | # Date 3 0 |
|
2124 | 2120 | # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
2125 | 2121 | # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
2126 | 2122 | c |
|
2127 | 2123 | |
|
2128 | 2124 | diff -r 97d72e5f12c7 -r ff2c9fa2018b c |
|
2129 | 2125 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2130 | 2126 | +++ b/c Thu Jan 01 00:00:03 1970 +0000 |
|
2131 | 2127 | @@ -0,0 +1,1 @@ |
|
2132 | 2128 | +c |
|
2133 | 2129 | |
|
2134 | 2130 | Displaying [PATCH 2 of 8] utf-8 content ... |
|
2135 | 2131 | Content-Type: text/plain; charset="us-ascii" |
|
2136 | 2132 | MIME-Version: 1.0 |
|
2137 | 2133 | Content-Transfer-Encoding: 8bit |
|
2138 | 2134 | Subject: [PATCH 2 of 8] utf-8 content |
|
2139 | 2135 | X-Mercurial-Node: 909a00e13e9d78b575aeee23dddbada46d5a143f |
|
2140 | 2136 | Message-Id: <909a00e13e9d78b575ae.315532862@*> (glob) |
|
2141 | 2137 | In-Reply-To: <patchbomb.315532860@*> (glob) |
|
2142 | 2138 | References: <patchbomb.315532860@*> (glob) |
|
2143 | 2139 | User-Agent: Mercurial-patchbomb/* (glob) |
|
2144 | 2140 | Date: Tue, 01 Jan 1980 00:01:02 +0000 |
|
2145 | 2141 | From: test |
|
2146 | 2142 | To: foo |
|
2147 | 2143 | |
|
2148 | 2144 | # HG changeset patch |
|
2149 | 2145 | # User test |
|
2150 | 2146 | # Date 4 0 |
|
2151 | 2147 | # Node ID 909a00e13e9d78b575aeee23dddbada46d5a143f |
|
2152 | 2148 | # Parent ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
2153 | 2149 | utf-8 content |
|
2154 | 2150 | |
|
2155 | 2151 | diff -r ff2c9fa2018b -r 909a00e13e9d description |
|
2156 | 2152 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2157 | 2153 | +++ b/description Thu Jan 01 00:00:04 1970 +0000 |
|
2158 | 2154 | @@ -0,0 +1,3 @@ |
|
2159 | 2155 | +a multiline |
|
2160 | 2156 | + |
|
2161 | 2157 | +description |
|
2162 | 2158 | diff -r ff2c9fa2018b -r 909a00e13e9d utf |
|
2163 | 2159 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2164 | 2160 | +++ b/utf Thu Jan 01 00:00:04 1970 +0000 |
|
2165 | 2161 | @@ -0,0 +1,1 @@ |
|
2166 | 2162 | +h\xc3\xb6mma! (esc) |
|
2167 | 2163 | |
|
2168 | 2164 | Displaying [PATCH 3 of 8] long line ... |
|
2169 | 2165 | Content-Type: text/plain; charset="us-ascii" |
|
2170 | 2166 | MIME-Version: 1.0 |
|
2171 | 2167 | Content-Transfer-Encoding: quoted-printable |
|
2172 | 2168 | Subject: [PATCH 3 of 8] long line |
|
2173 | 2169 | X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 |
|
2174 | 2170 | Message-Id: <a2ea8fc83dd8b93cfd86.315532863@*> (glob) |
|
2175 | 2171 | In-Reply-To: <patchbomb.315532860@*> (glob) |
|
2176 | 2172 | References: <patchbomb.315532860@*> (glob) |
|
2177 | 2173 | User-Agent: Mercurial-patchbomb/* (glob) |
|
2178 | 2174 | Date: Tue, 01 Jan 1980 00:01:03 +0000 |
|
2179 | 2175 | From: test |
|
2180 | 2176 | To: foo |
|
2181 | 2177 | |
|
2182 | 2178 | # HG changeset patch |
|
2183 | 2179 | # User test |
|
2184 | 2180 | # Date 4 0 |
|
2185 | 2181 | # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 |
|
2186 | 2182 | # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f |
|
2187 | 2183 | long line |
|
2188 | 2184 | |
|
2189 | 2185 | diff -r 909a00e13e9d -r a2ea8fc83dd8 long |
|
2190 | 2186 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2191 | 2187 | +++ b/long Thu Jan 01 00:00:04 1970 +0000 |
|
2192 | 2188 | @@ -0,0 +1,4 @@ |
|
2193 | 2189 | +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
2194 | 2190 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
2195 | 2191 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
2196 | 2192 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
2197 | 2193 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
2198 | 2194 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
2199 | 2195 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
2200 | 2196 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
2201 | 2197 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
2202 | 2198 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
2203 | 2199 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
2204 | 2200 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
2205 | 2201 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= |
|
2206 | 2202 | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx |
|
2207 | 2203 | +foo |
|
2208 | 2204 | + |
|
2209 | 2205 | +bar |
|
2210 | 2206 | |
|
2211 | 2207 | Displaying [PATCH 4 of 8] isolatin 8-bit encoding ... |
|
2212 | 2208 | Content-Type: text/plain; charset="us-ascii" |
|
2213 | 2209 | MIME-Version: 1.0 |
|
2214 | 2210 | Content-Transfer-Encoding: 8bit |
|
2215 | 2211 | Subject: [PATCH 4 of 8] isolatin 8-bit encoding |
|
2216 | 2212 | X-Mercurial-Node: 240fb913fc1b7ff15ddb9f33e73d82bf5277c720 |
|
2217 | 2213 | Message-Id: <240fb913fc1b7ff15ddb.315532864@*> (glob) |
|
2218 | 2214 | In-Reply-To: <patchbomb.315532860@*> (glob) |
|
2219 | 2215 | References: <patchbomb.315532860@*> (glob) |
|
2220 | 2216 | User-Agent: Mercurial-patchbomb/* (glob) |
|
2221 | 2217 | Date: Tue, 01 Jan 1980 00:01:04 +0000 |
|
2222 | 2218 | From: test |
|
2223 | 2219 | To: foo |
|
2224 | 2220 | |
|
2225 | 2221 | # HG changeset patch |
|
2226 | 2222 | # User test |
|
2227 | 2223 | # Date 5 0 |
|
2228 | 2224 | # Node ID 240fb913fc1b7ff15ddb9f33e73d82bf5277c720 |
|
2229 | 2225 | # Parent a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 |
|
2230 | 2226 | isolatin 8-bit encoding |
|
2231 | 2227 | |
|
2232 | 2228 | diff -r a2ea8fc83dd8 -r 240fb913fc1b isolatin |
|
2233 | 2229 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2234 | 2230 | +++ b/isolatin Thu Jan 01 00:00:05 1970 +0000 |
|
2235 | 2231 | @@ -0,0 +1,1 @@ |
|
2236 | 2232 | +h\xf6mma! (esc) |
|
2237 | 2233 | |
|
2238 | 2234 | Displaying [PATCH 5 of 8] Added tag zero, zero.foo for changeset 8580ff50825a ... |
|
2239 | 2235 | Content-Type: text/plain; charset="us-ascii" |
|
2240 | 2236 | MIME-Version: 1.0 |
|
2241 | 2237 | Content-Transfer-Encoding: 7bit |
|
2242 | 2238 | Subject: [PATCH 5 of 8] Added tag zero, zero.foo for changeset 8580ff50825a |
|
2243 | 2239 | X-Mercurial-Node: 5d5ef15dfe5e7bd3a4ee154b5fff76c7945ec433 |
|
2244 | 2240 | Message-Id: <5d5ef15dfe5e7bd3a4ee.315532865@*> (glob) |
|
2245 | 2241 | In-Reply-To: <patchbomb.315532860@*> (glob) |
|
2246 | 2242 | References: <patchbomb.315532860@*> (glob) |
|
2247 | 2243 | User-Agent: Mercurial-patchbomb/* (glob) |
|
2248 | 2244 | Date: Tue, 01 Jan 1980 00:01:05 +0000 |
|
2249 | 2245 | From: test |
|
2250 | 2246 | To: foo |
|
2251 | 2247 | |
|
2252 | 2248 | # HG changeset patch |
|
2253 | 2249 | # User test |
|
2254 | 2250 | # Date 0 0 |
|
2255 | 2251 | # Node ID 5d5ef15dfe5e7bd3a4ee154b5fff76c7945ec433 |
|
2256 | 2252 | # Parent 240fb913fc1b7ff15ddb9f33e73d82bf5277c720 |
|
2257 | 2253 | Added tag zero, zero.foo for changeset 8580ff50825a |
|
2258 | 2254 | |
|
2259 | 2255 | diff -r 240fb913fc1b -r 5d5ef15dfe5e .hgtags |
|
2260 | 2256 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2261 | 2257 | +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000 |
|
2262 | 2258 | @@ -0,0 +1,2 @@ |
|
2263 | 2259 | +8580ff50825a50c8f716709acdf8de0deddcd6ab zero |
|
2264 | 2260 | +8580ff50825a50c8f716709acdf8de0deddcd6ab zero.foo |
|
2265 | 2261 | |
|
2266 | 2262 | Displaying [PATCH 6 of 8] Added tag one, one.patch for changeset 97d72e5f12c7 ... |
|
2267 | 2263 | Content-Type: text/plain; charset="us-ascii" |
|
2268 | 2264 | MIME-Version: 1.0 |
|
2269 | 2265 | Content-Transfer-Encoding: 7bit |
|
2270 | 2266 | Subject: [PATCH 6 of 8] Added tag one, one.patch for changeset 97d72e5f12c7 |
|
2271 | 2267 | X-Mercurial-Node: 045ca29b1ea20e4940411e695e20e521f2f0f98e |
|
2272 | 2268 | Message-Id: <045ca29b1ea20e494041.315532866@*> (glob) |
|
2273 | 2269 | In-Reply-To: <patchbomb.315532860@*> (glob) |
|
2274 | 2270 | References: <patchbomb.315532860@*> (glob) |
|
2275 | 2271 | User-Agent: Mercurial-patchbomb/* (glob) |
|
2276 | 2272 | Date: Tue, 01 Jan 1980 00:01:06 +0000 |
|
2277 | 2273 | From: test |
|
2278 | 2274 | To: foo |
|
2279 | 2275 | |
|
2280 | 2276 | # HG changeset patch |
|
2281 | 2277 | # User test |
|
2282 | 2278 | # Date 0 0 |
|
2283 | 2279 | # Node ID 045ca29b1ea20e4940411e695e20e521f2f0f98e |
|
2284 | 2280 | # Parent 5d5ef15dfe5e7bd3a4ee154b5fff76c7945ec433 |
|
2285 | 2281 | Added tag one, one.patch for changeset 97d72e5f12c7 |
|
2286 | 2282 | |
|
2287 | 2283 | diff -r 5d5ef15dfe5e -r 045ca29b1ea2 .hgtags |
|
2288 | 2284 | --- a/.hgtags Thu Jan 01 00:00:00 1970 +0000 |
|
2289 | 2285 | +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000 |
|
2290 | 2286 | @@ -1,2 +1,4 @@ |
|
2291 | 2287 | 8580ff50825a50c8f716709acdf8de0deddcd6ab zero |
|
2292 | 2288 | 8580ff50825a50c8f716709acdf8de0deddcd6ab zero.foo |
|
2293 | 2289 | +97d72e5f12c7e84f85064aa72e5a297142c36ed9 one |
|
2294 | 2290 | +97d72e5f12c7e84f85064aa72e5a297142c36ed9 one.patch |
|
2295 | 2291 | |
|
2296 | 2292 | Displaying [PATCH 7 of 8] Added tag two, two.diff for changeset ff2c9fa2018b ... |
|
2297 | 2293 | Content-Type: text/plain; charset="us-ascii" |
|
2298 | 2294 | MIME-Version: 1.0 |
|
2299 | 2295 | Content-Transfer-Encoding: 7bit |
|
2300 | 2296 | Subject: [PATCH 7 of 8] Added tag two, two.diff for changeset ff2c9fa2018b |
|
2301 | 2297 | X-Mercurial-Node: 7aead2484924c445ad8ce2613df91f52f9e502ed |
|
2302 | 2298 | Message-Id: <7aead2484924c445ad8c.315532867@*> (glob) |
|
2303 | 2299 | In-Reply-To: <patchbomb.315532860@*> (glob) |
|
2304 | 2300 | References: <patchbomb.315532860@*> (glob) |
|
2305 | 2301 | User-Agent: Mercurial-patchbomb/* (glob) |
|
2306 | 2302 | Date: Tue, 01 Jan 1980 00:01:07 +0000 |
|
2307 | 2303 | From: test |
|
2308 | 2304 | To: foo |
|
2309 | 2305 | |
|
2310 | 2306 | # HG changeset patch |
|
2311 | 2307 | # User test |
|
2312 | 2308 | # Date 0 0 |
|
2313 | 2309 | # Node ID 7aead2484924c445ad8ce2613df91f52f9e502ed |
|
2314 | 2310 | # Parent 045ca29b1ea20e4940411e695e20e521f2f0f98e |
|
2315 | 2311 | Added tag two, two.diff for changeset ff2c9fa2018b |
|
2316 | 2312 | |
|
2317 | 2313 | diff -r 045ca29b1ea2 -r 7aead2484924 .hgtags |
|
2318 | 2314 | --- a/.hgtags Thu Jan 01 00:00:00 1970 +0000 |
|
2319 | 2315 | +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000 |
|
2320 | 2316 | @@ -2,3 +2,5 @@ |
|
2321 | 2317 | 8580ff50825a50c8f716709acdf8de0deddcd6ab zero.foo |
|
2322 | 2318 | 97d72e5f12c7e84f85064aa72e5a297142c36ed9 one |
|
2323 | 2319 | 97d72e5f12c7e84f85064aa72e5a297142c36ed9 one.patch |
|
2324 | 2320 | +ff2c9fa2018b15fa74b33363bda9527323e2a99f two |
|
2325 | 2321 | +ff2c9fa2018b15fa74b33363bda9527323e2a99f two.diff |
|
2326 | 2322 | |
|
2327 | 2323 | Displaying [PATCH 8 of 8] d ... |
|
2328 | 2324 | Content-Type: text/plain; charset="us-ascii" |
|
2329 | 2325 | MIME-Version: 1.0 |
|
2330 | 2326 | Content-Transfer-Encoding: 7bit |
|
2331 | 2327 | Subject: [PATCH 8 of 8] d |
|
2332 | 2328 | X-Mercurial-Node: 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268 |
|
2333 | 2329 | Message-Id: <2f9fa9b998c5fe3ac2bd.315532868@*> (glob) |
|
2334 | 2330 | In-Reply-To: <patchbomb.315532860@*> (glob) |
|
2335 | 2331 | References: <patchbomb.315532860@*> (glob) |
|
2336 | 2332 | User-Agent: Mercurial-patchbomb/* (glob) |
|
2337 | 2333 | Date: Tue, 01 Jan 1980 00:01:08 +0000 |
|
2338 | 2334 | From: test |
|
2339 | 2335 | To: foo |
|
2340 | 2336 | |
|
2341 | 2337 | # HG changeset patch |
|
2342 | 2338 | # User test |
|
2343 | 2339 | # Date 4 0 |
|
2344 | 2340 | # Branch test |
|
2345 | 2341 | # Node ID 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268 |
|
2346 | 2342 | # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
2347 | 2343 | d |
|
2348 | 2344 | |
|
2349 | 2345 | diff -r 97d72e5f12c7 -r 2f9fa9b998c5 d |
|
2350 | 2346 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2351 | 2347 | +++ b/d Thu Jan 01 00:00:04 1970 +0000 |
|
2352 | 2348 | @@ -0,0 +1,1 @@ |
|
2353 | 2349 | +d |
|
2354 | 2350 | |
|
2355 | 2351 | |
|
2356 | 2352 | dest#branch URIs: |
|
2357 | 2353 | $ hg email --date '1980-1-1 0:1' -n -t foo -s test -o ../t#test |
|
2358 | 2354 | comparing with ../t |
|
2359 | 2355 | searching for changes |
|
2360 | 2356 | From [test]: test |
|
2361 | 2357 | This patch series consists of 1 patches. |
|
2362 | 2358 | |
|
2363 | 2359 | Cc: |
|
2364 | 2360 | |
|
2365 | 2361 | Displaying [PATCH] test ... |
|
2366 | 2362 | Content-Type: text/plain; charset="us-ascii" |
|
2367 | 2363 | MIME-Version: 1.0 |
|
2368 | 2364 | Content-Transfer-Encoding: 7bit |
|
2369 | 2365 | Subject: [PATCH] test |
|
2370 | 2366 | X-Mercurial-Node: 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268 |
|
2371 | 2367 | Message-Id: <2f9fa9b998c5fe3ac2bd.315532860@*> (glob) |
|
2372 | 2368 | User-Agent: Mercurial-patchbomb/* (glob) |
|
2373 | 2369 | Date: Tue, 01 Jan 1980 00:01:00 +0000 |
|
2374 | 2370 | From: test |
|
2375 | 2371 | To: foo |
|
2376 | 2372 | |
|
2377 | 2373 | # HG changeset patch |
|
2378 | 2374 | # User test |
|
2379 | 2375 | # Date 4 0 |
|
2380 | 2376 | # Branch test |
|
2381 | 2377 | # Node ID 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268 |
|
2382 | 2378 | # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
2383 | 2379 | d |
|
2384 | 2380 | |
|
2385 | 2381 | diff -r 97d72e5f12c7 -r 2f9fa9b998c5 d |
|
2386 | 2382 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2387 | 2383 | +++ b/d Thu Jan 01 00:00:04 1970 +0000 |
|
2388 | 2384 | @@ -0,0 +1,1 @@ |
|
2389 | 2385 | +d |
|
2390 | 2386 |
@@ -1,1227 +1,1219 b'' | |||
|
1 | $ "$TESTDIR/hghave" execbit || exit 80 | |
|
2 | ||
|
3 | 1 | Set up a repo |
|
4 | 2 | |
|
5 | 3 | $ echo "[ui]" >> $HGRCPATH |
|
6 | 4 | $ echo "interactive=true" >> $HGRCPATH |
|
7 | 5 | $ echo "[extensions]" >> $HGRCPATH |
|
8 | 6 | $ echo "record=" >> $HGRCPATH |
|
9 | 7 | |
|
10 | 8 | $ hg init a |
|
11 | 9 | $ cd a |
|
12 | 10 | |
|
13 | 11 | Select no files |
|
14 | 12 | |
|
15 | 13 | $ touch empty-rw |
|
16 | 14 | $ hg add empty-rw |
|
17 | 15 | |
|
18 | 16 | $ hg record empty-rw<<EOF |
|
19 | 17 | > n |
|
20 | 18 | > EOF |
|
21 | 19 | diff --git a/empty-rw b/empty-rw |
|
22 | 20 | new file mode 100644 |
|
23 | 21 | examine changes to 'empty-rw'? [Ynesfdaq?] |
|
24 | 22 | no changes to record |
|
25 | 23 | |
|
26 | 24 | $ hg tip -p |
|
27 | 25 | changeset: -1:000000000000 |
|
28 | 26 | tag: tip |
|
29 | 27 | user: |
|
30 | 28 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
31 | 29 | |
|
32 | 30 | |
|
33 | 31 | |
|
34 | 32 | Select files but no hunks |
|
35 | 33 | |
|
36 | 34 | $ hg record empty-rw<<EOF |
|
37 | 35 | > y |
|
38 | 36 | > n |
|
39 | 37 | > EOF |
|
40 | 38 | diff --git a/empty-rw b/empty-rw |
|
41 | 39 | new file mode 100644 |
|
42 | 40 | examine changes to 'empty-rw'? [Ynesfdaq?] |
|
43 | 41 | abort: empty commit message |
|
44 | 42 | [255] |
|
45 | 43 | |
|
46 | 44 | $ hg tip -p |
|
47 | 45 | changeset: -1:000000000000 |
|
48 | 46 | tag: tip |
|
49 | 47 | user: |
|
50 | 48 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
51 | 49 | |
|
52 | 50 | |
|
53 | 51 | |
|
54 | 52 | Record empty file |
|
55 | 53 | |
|
56 | 54 | $ hg record -d '0 0' -m empty empty-rw<<EOF |
|
57 | 55 | > y |
|
58 | 56 | > y |
|
59 | 57 | > EOF |
|
60 | 58 | diff --git a/empty-rw b/empty-rw |
|
61 | 59 | new file mode 100644 |
|
62 | 60 | examine changes to 'empty-rw'? [Ynesfdaq?] |
|
63 | 61 | |
|
64 | 62 | $ hg tip -p |
|
65 | 63 | changeset: 0:c0708cf4e46e |
|
66 | 64 | tag: tip |
|
67 | 65 | user: test |
|
68 | 66 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
69 | 67 | summary: empty |
|
70 | 68 | |
|
71 | 69 | |
|
72 | 70 | |
|
73 | 71 | Summary shows we updated to the new cset |
|
74 | 72 | |
|
75 | 73 | $ hg summary |
|
76 | 74 | parent: 0:c0708cf4e46e tip |
|
77 | 75 | empty |
|
78 | 76 | branch: default |
|
79 | 77 | commit: (clean) |
|
80 | 78 | update: (current) |
|
81 | 79 | |
|
82 | 80 | Rename empty file |
|
83 | 81 | |
|
84 | 82 | $ hg mv empty-rw empty-rename |
|
85 | 83 | $ hg record -d '1 0' -m rename<<EOF |
|
86 | 84 | > y |
|
87 | 85 | > EOF |
|
88 | 86 | diff --git a/empty-rw b/empty-rename |
|
89 | 87 | rename from empty-rw |
|
90 | 88 | rename to empty-rename |
|
91 | 89 | examine changes to 'empty-rw' and 'empty-rename'? [Ynesfdaq?] |
|
92 | 90 | |
|
93 | 91 | $ hg tip -p |
|
94 | 92 | changeset: 1:d695e8dcb197 |
|
95 | 93 | tag: tip |
|
96 | 94 | user: test |
|
97 | 95 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
98 | 96 | summary: rename |
|
99 | 97 | |
|
100 | 98 | |
|
101 | 99 | |
|
102 | 100 | Copy empty file |
|
103 | 101 | |
|
104 | 102 | $ hg cp empty-rename empty-copy |
|
105 | 103 | $ hg record -d '2 0' -m copy<<EOF |
|
106 | 104 | > y |
|
107 | 105 | > EOF |
|
108 | 106 | diff --git a/empty-rename b/empty-copy |
|
109 | 107 | copy from empty-rename |
|
110 | 108 | copy to empty-copy |
|
111 | 109 | examine changes to 'empty-rename' and 'empty-copy'? [Ynesfdaq?] |
|
112 | 110 | |
|
113 | 111 | $ hg tip -p |
|
114 | 112 | changeset: 2:1d4b90bea524 |
|
115 | 113 | tag: tip |
|
116 | 114 | user: test |
|
117 | 115 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
118 | 116 | summary: copy |
|
119 | 117 | |
|
120 | 118 | |
|
121 | 119 | |
|
122 | 120 | Delete empty file |
|
123 | 121 | |
|
124 | 122 | $ hg rm empty-copy |
|
125 | 123 | $ hg record -d '3 0' -m delete<<EOF |
|
126 | 124 | > y |
|
127 | 125 | > EOF |
|
128 | 126 | diff --git a/empty-copy b/empty-copy |
|
129 | 127 | deleted file mode 100644 |
|
130 | 128 | examine changes to 'empty-copy'? [Ynesfdaq?] |
|
131 | 129 | |
|
132 | 130 | $ hg tip -p |
|
133 | 131 | changeset: 3:b39a238f01a1 |
|
134 | 132 | tag: tip |
|
135 | 133 | user: test |
|
136 | 134 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
137 | 135 | summary: delete |
|
138 | 136 | |
|
139 | 137 | |
|
140 | 138 | |
|
141 | 139 | Add binary file |
|
142 | 140 | |
|
143 | 141 | $ hg bundle --base -2 tip.bundle |
|
144 | 142 | 1 changesets found |
|
145 | 143 | $ hg add tip.bundle |
|
146 | 144 | $ hg record -d '4 0' -m binary<<EOF |
|
147 | 145 | > y |
|
148 | 146 | > EOF |
|
149 | 147 | diff --git a/tip.bundle b/tip.bundle |
|
150 | 148 | new file mode 100644 |
|
151 | 149 | this is a binary file |
|
152 | 150 | examine changes to 'tip.bundle'? [Ynesfdaq?] |
|
153 | 151 | |
|
154 | 152 | $ hg tip -p |
|
155 | 153 | changeset: 4:ad816da3711e |
|
156 | 154 | tag: tip |
|
157 | 155 | user: test |
|
158 | 156 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
159 | 157 | summary: binary |
|
160 | 158 | |
|
161 | 159 | diff -r b39a238f01a1 -r ad816da3711e tip.bundle |
|
162 | 160 | Binary file tip.bundle has changed |
|
163 | 161 | |
|
164 | 162 | |
|
165 | 163 | Change binary file |
|
166 | 164 | |
|
167 | 165 | $ hg bundle --base -2 tip.bundle |
|
168 | 166 | 1 changesets found |
|
169 | 167 | $ hg record -d '5 0' -m binary-change<<EOF |
|
170 | 168 | > y |
|
171 | 169 | > EOF |
|
172 | 170 | diff --git a/tip.bundle b/tip.bundle |
|
173 | 171 | this modifies a binary file (all or nothing) |
|
174 | 172 | examine changes to 'tip.bundle'? [Ynesfdaq?] |
|
175 | 173 | |
|
176 | 174 | $ hg tip -p |
|
177 | 175 | changeset: 5:dccd6f3eb485 |
|
178 | 176 | tag: tip |
|
179 | 177 | user: test |
|
180 | 178 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
181 | 179 | summary: binary-change |
|
182 | 180 | |
|
183 | 181 | diff -r ad816da3711e -r dccd6f3eb485 tip.bundle |
|
184 | 182 | Binary file tip.bundle has changed |
|
185 | 183 | |
|
186 | 184 | |
|
187 | 185 | Rename and change binary file |
|
188 | 186 | |
|
189 | 187 | $ hg mv tip.bundle top.bundle |
|
190 | 188 | $ hg bundle --base -2 top.bundle |
|
191 | 189 | 1 changesets found |
|
192 | 190 | $ hg record -d '6 0' -m binary-change-rename<<EOF |
|
193 | 191 | > y |
|
194 | 192 | > EOF |
|
195 | 193 | diff --git a/tip.bundle b/top.bundle |
|
196 | 194 | rename from tip.bundle |
|
197 | 195 | rename to top.bundle |
|
198 | 196 | this modifies a binary file (all or nothing) |
|
199 | 197 | examine changes to 'tip.bundle' and 'top.bundle'? [Ynesfdaq?] |
|
200 | 198 | |
|
201 | 199 | $ hg tip -p |
|
202 | 200 | changeset: 6:7fa44105f5b3 |
|
203 | 201 | tag: tip |
|
204 | 202 | user: test |
|
205 | 203 | date: Thu Jan 01 00:00:06 1970 +0000 |
|
206 | 204 | summary: binary-change-rename |
|
207 | 205 | |
|
208 | 206 | diff -r dccd6f3eb485 -r 7fa44105f5b3 tip.bundle |
|
209 | 207 | Binary file tip.bundle has changed |
|
210 | 208 | diff -r dccd6f3eb485 -r 7fa44105f5b3 top.bundle |
|
211 | 209 | Binary file top.bundle has changed |
|
212 | 210 | |
|
213 | 211 | |
|
214 | 212 | Add plain file |
|
215 | 213 | |
|
216 | 214 | $ for i in 1 2 3 4 5 6 7 8 9 10; do |
|
217 | 215 | > echo $i >> plain |
|
218 | 216 | > done |
|
219 | 217 | |
|
220 | 218 | $ hg add plain |
|
221 | 219 | $ hg record -d '7 0' -m plain plain<<EOF |
|
222 | 220 | > y |
|
223 | 221 | > y |
|
224 | 222 | > EOF |
|
225 | 223 | diff --git a/plain b/plain |
|
226 | 224 | new file mode 100644 |
|
227 | 225 | examine changes to 'plain'? [Ynesfdaq?] |
|
228 | 226 | |
|
229 | 227 | $ hg tip -p |
|
230 | 228 | changeset: 7:11fb457c1be4 |
|
231 | 229 | tag: tip |
|
232 | 230 | user: test |
|
233 | 231 | date: Thu Jan 01 00:00:07 1970 +0000 |
|
234 | 232 | summary: plain |
|
235 | 233 | |
|
236 | 234 | diff -r 7fa44105f5b3 -r 11fb457c1be4 plain |
|
237 | 235 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
238 | 236 | +++ b/plain Thu Jan 01 00:00:07 1970 +0000 |
|
239 | 237 | @@ -0,0 +1,10 @@ |
|
240 | 238 | +1 |
|
241 | 239 | +2 |
|
242 | 240 | +3 |
|
243 | 241 | +4 |
|
244 | 242 | +5 |
|
245 | 243 | +6 |
|
246 | 244 | +7 |
|
247 | 245 | +8 |
|
248 | 246 | +9 |
|
249 | 247 | +10 |
|
250 | 248 | |
|
251 | 249 | |
|
252 | 250 | Modify end of plain file |
|
253 | 251 | |
|
254 | 252 | $ echo 11 >> plain |
|
255 | 253 | $ hg record -d '8 0' -m end plain <<EOF |
|
256 | 254 | > y |
|
257 | 255 | > y |
|
258 | 256 | > EOF |
|
259 | 257 | diff --git a/plain b/plain |
|
260 | 258 | 1 hunks, 1 lines changed |
|
261 | 259 | examine changes to 'plain'? [Ynesfdaq?] |
|
262 | 260 | @@ -8,3 +8,4 @@ |
|
263 | 261 | 8 |
|
264 | 262 | 9 |
|
265 | 263 | 10 |
|
266 | 264 | +11 |
|
267 | 265 | record this change to 'plain'? [Ynesfdaq?] |
|
268 | 266 | |
|
269 | 267 | Modify end of plain file, no EOL |
|
270 | 268 | |
|
271 | 269 | $ hg tip --template '{node}' >> plain |
|
272 | 270 | $ hg record -d '9 0' -m noeol plain <<EOF |
|
273 | 271 | > y |
|
274 | 272 | > y |
|
275 | 273 | > EOF |
|
276 | 274 | diff --git a/plain b/plain |
|
277 | 275 | 1 hunks, 1 lines changed |
|
278 | 276 | examine changes to 'plain'? [Ynesfdaq?] |
|
279 | 277 | @@ -9,3 +9,4 @@ |
|
280 | 278 | 9 |
|
281 | 279 | 10 |
|
282 | 280 | 11 |
|
283 | 281 | +7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
284 | 282 | \ No newline at end of file |
|
285 | 283 | record this change to 'plain'? [Ynesfdaq?] |
|
286 | 284 | |
|
287 | 285 | Modify end of plain file, add EOL |
|
288 | 286 | |
|
289 | 287 | $ echo >> plain |
|
290 | 288 | $ echo 1 > plain2 |
|
291 | 289 | $ hg add plain2 |
|
292 | 290 | $ hg record -d '10 0' -m eol plain plain2 <<EOF |
|
293 | 291 | > y |
|
294 | 292 | > y |
|
295 | 293 | > y |
|
296 | 294 | > EOF |
|
297 | 295 | diff --git a/plain b/plain |
|
298 | 296 | 1 hunks, 1 lines changed |
|
299 | 297 | examine changes to 'plain'? [Ynesfdaq?] |
|
300 | 298 | @@ -9,4 +9,4 @@ |
|
301 | 299 | 9 |
|
302 | 300 | 10 |
|
303 | 301 | 11 |
|
304 | 302 | -7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
305 | 303 | \ No newline at end of file |
|
306 | 304 | +7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
307 | 305 | record change 1/2 to 'plain'? [Ynesfdaq?] |
|
308 | 306 | diff --git a/plain2 b/plain2 |
|
309 | 307 | new file mode 100644 |
|
310 | 308 | examine changes to 'plain2'? [Ynesfdaq?] |
|
311 | 309 | |
|
312 | 310 | Modify beginning, trim end, record both, add another file to test |
|
313 | 311 | changes numbering |
|
314 | 312 | |
|
315 | 313 | $ rm plain |
|
316 | 314 | $ for i in 2 2 3 4 5 6 7 8 9 10; do |
|
317 | 315 | > echo $i >> plain |
|
318 | 316 | > done |
|
319 | 317 | $ echo 2 >> plain2 |
|
320 | 318 | |
|
321 | 319 | $ hg record -d '10 0' -m begin-and-end plain plain2 <<EOF |
|
322 | 320 | > y |
|
323 | 321 | > y |
|
324 | 322 | > y |
|
325 | 323 | > y |
|
326 | 324 | > y |
|
327 | 325 | > EOF |
|
328 | 326 | diff --git a/plain b/plain |
|
329 | 327 | 2 hunks, 3 lines changed |
|
330 | 328 | examine changes to 'plain'? [Ynesfdaq?] |
|
331 | 329 | @@ -1,4 +1,4 @@ |
|
332 | 330 | -1 |
|
333 | 331 | +2 |
|
334 | 332 | 2 |
|
335 | 333 | 3 |
|
336 | 334 | 4 |
|
337 | 335 | record change 1/3 to 'plain'? [Ynesfdaq?] |
|
338 | 336 | @@ -8,5 +8,3 @@ |
|
339 | 337 | 8 |
|
340 | 338 | 9 |
|
341 | 339 | 10 |
|
342 | 340 | -11 |
|
343 | 341 | -7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
344 | 342 | record change 2/3 to 'plain'? [Ynesfdaq?] |
|
345 | 343 | diff --git a/plain2 b/plain2 |
|
346 | 344 | 1 hunks, 1 lines changed |
|
347 | 345 | examine changes to 'plain2'? [Ynesfdaq?] |
|
348 | 346 | @@ -1,1 +1,2 @@ |
|
349 | 347 | 1 |
|
350 | 348 | +2 |
|
351 | 349 | record change 3/3 to 'plain2'? [Ynesfdaq?] |
|
352 | 350 | |
|
353 | 351 | $ hg tip -p |
|
354 | 352 | changeset: 11:21df83db12b8 |
|
355 | 353 | tag: tip |
|
356 | 354 | user: test |
|
357 | 355 | date: Thu Jan 01 00:00:10 1970 +0000 |
|
358 | 356 | summary: begin-and-end |
|
359 | 357 | |
|
360 | 358 | diff -r ddb8b281c3ff -r 21df83db12b8 plain |
|
361 | 359 | --- a/plain Thu Jan 01 00:00:10 1970 +0000 |
|
362 | 360 | +++ b/plain Thu Jan 01 00:00:10 1970 +0000 |
|
363 | 361 | @@ -1,4 +1,4 @@ |
|
364 | 362 | -1 |
|
365 | 363 | +2 |
|
366 | 364 | 2 |
|
367 | 365 | 3 |
|
368 | 366 | 4 |
|
369 | 367 | @@ -8,5 +8,3 @@ |
|
370 | 368 | 8 |
|
371 | 369 | 9 |
|
372 | 370 | 10 |
|
373 | 371 | -11 |
|
374 | 372 | -7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
375 | 373 | diff -r ddb8b281c3ff -r 21df83db12b8 plain2 |
|
376 | 374 | --- a/plain2 Thu Jan 01 00:00:10 1970 +0000 |
|
377 | 375 | +++ b/plain2 Thu Jan 01 00:00:10 1970 +0000 |
|
378 | 376 | @@ -1,1 +1,2 @@ |
|
379 | 377 | 1 |
|
380 | 378 | +2 |
|
381 | 379 | |
|
382 | 380 | |
|
383 | 381 | Trim beginning, modify end |
|
384 | 382 | |
|
385 | 383 | $ rm plain |
|
386 | 384 | > for i in 4 5 6 7 8 9 10.new; do |
|
387 | 385 | > echo $i >> plain |
|
388 | 386 | > done |
|
389 | 387 | |
|
390 | 388 | Record end |
|
391 | 389 | |
|
392 | 390 | $ hg record -d '11 0' -m end-only plain <<EOF |
|
393 | 391 | > y |
|
394 | 392 | > n |
|
395 | 393 | > y |
|
396 | 394 | > EOF |
|
397 | 395 | diff --git a/plain b/plain |
|
398 | 396 | 2 hunks, 4 lines changed |
|
399 | 397 | examine changes to 'plain'? [Ynesfdaq?] |
|
400 | 398 | @@ -1,9 +1,6 @@ |
|
401 | 399 | -2 |
|
402 | 400 | -2 |
|
403 | 401 | -3 |
|
404 | 402 | 4 |
|
405 | 403 | 5 |
|
406 | 404 | 6 |
|
407 | 405 | 7 |
|
408 | 406 | 8 |
|
409 | 407 | 9 |
|
410 | 408 | record change 1/2 to 'plain'? [Ynesfdaq?] |
|
411 | 409 | @@ -4,7 +1,7 @@ |
|
412 | 410 | 4 |
|
413 | 411 | 5 |
|
414 | 412 | 6 |
|
415 | 413 | 7 |
|
416 | 414 | 8 |
|
417 | 415 | 9 |
|
418 | 416 | -10 |
|
419 | 417 | +10.new |
|
420 | 418 | record change 2/2 to 'plain'? [Ynesfdaq?] |
|
421 | 419 | |
|
422 | 420 | $ hg tip -p |
|
423 | 421 | changeset: 12:99337501826f |
|
424 | 422 | tag: tip |
|
425 | 423 | user: test |
|
426 | 424 | date: Thu Jan 01 00:00:11 1970 +0000 |
|
427 | 425 | summary: end-only |
|
428 | 426 | |
|
429 | 427 | diff -r 21df83db12b8 -r 99337501826f plain |
|
430 | 428 | --- a/plain Thu Jan 01 00:00:10 1970 +0000 |
|
431 | 429 | +++ b/plain Thu Jan 01 00:00:11 1970 +0000 |
|
432 | 430 | @@ -7,4 +7,4 @@ |
|
433 | 431 | 7 |
|
434 | 432 | 8 |
|
435 | 433 | 9 |
|
436 | 434 | -10 |
|
437 | 435 | +10.new |
|
438 | 436 | |
|
439 | 437 | |
|
440 | 438 | Record beginning |
|
441 | 439 | |
|
442 | 440 | $ hg record -d '12 0' -m begin-only plain <<EOF |
|
443 | 441 | > y |
|
444 | 442 | > y |
|
445 | 443 | > EOF |
|
446 | 444 | diff --git a/plain b/plain |
|
447 | 445 | 1 hunks, 3 lines changed |
|
448 | 446 | examine changes to 'plain'? [Ynesfdaq?] |
|
449 | 447 | @@ -1,6 +1,3 @@ |
|
450 | 448 | -2 |
|
451 | 449 | -2 |
|
452 | 450 | -3 |
|
453 | 451 | 4 |
|
454 | 452 | 5 |
|
455 | 453 | 6 |
|
456 | 454 | record this change to 'plain'? [Ynesfdaq?] |
|
457 | 455 | |
|
458 | 456 | $ hg tip -p |
|
459 | 457 | changeset: 13:bbd45465d540 |
|
460 | 458 | tag: tip |
|
461 | 459 | user: test |
|
462 | 460 | date: Thu Jan 01 00:00:12 1970 +0000 |
|
463 | 461 | summary: begin-only |
|
464 | 462 | |
|
465 | 463 | diff -r 99337501826f -r bbd45465d540 plain |
|
466 | 464 | --- a/plain Thu Jan 01 00:00:11 1970 +0000 |
|
467 | 465 | +++ b/plain Thu Jan 01 00:00:12 1970 +0000 |
|
468 | 466 | @@ -1,6 +1,3 @@ |
|
469 | 467 | -2 |
|
470 | 468 | -2 |
|
471 | 469 | -3 |
|
472 | 470 | 4 |
|
473 | 471 | 5 |
|
474 | 472 | 6 |
|
475 | 473 | |
|
476 | 474 | |
|
477 | 475 | Add to beginning, trim from end |
|
478 | 476 | |
|
479 | 477 | $ rm plain |
|
480 | 478 | $ for i in 1 2 3 4 5 6 7 8 9; do |
|
481 | 479 | > echo $i >> plain |
|
482 | 480 | > done |
|
483 | 481 | |
|
484 | 482 | Record end |
|
485 | 483 | |
|
486 | 484 | $ hg record --traceback -d '13 0' -m end-again plain<<EOF |
|
487 | 485 | > y |
|
488 | 486 | > n |
|
489 | 487 | > y |
|
490 | 488 | > EOF |
|
491 | 489 | diff --git a/plain b/plain |
|
492 | 490 | 2 hunks, 4 lines changed |
|
493 | 491 | examine changes to 'plain'? [Ynesfdaq?] |
|
494 | 492 | @@ -1,6 +1,9 @@ |
|
495 | 493 | +1 |
|
496 | 494 | +2 |
|
497 | 495 | +3 |
|
498 | 496 | 4 |
|
499 | 497 | 5 |
|
500 | 498 | 6 |
|
501 | 499 | 7 |
|
502 | 500 | 8 |
|
503 | 501 | 9 |
|
504 | 502 | record change 1/2 to 'plain'? [Ynesfdaq?] |
|
505 | 503 | @@ -1,7 +4,6 @@ |
|
506 | 504 | 4 |
|
507 | 505 | 5 |
|
508 | 506 | 6 |
|
509 | 507 | 7 |
|
510 | 508 | 8 |
|
511 | 509 | 9 |
|
512 | 510 | -10.new |
|
513 | 511 | record change 2/2 to 'plain'? [Ynesfdaq?] |
|
514 | 512 | |
|
515 | 513 | Add to beginning, middle, end |
|
516 | 514 | |
|
517 | 515 | $ rm plain |
|
518 | 516 | $ for i in 1 2 3 4 5 5.new 5.reallynew 6 7 8 9 10 11; do |
|
519 | 517 | > echo $i >> plain |
|
520 | 518 | > done |
|
521 | 519 | |
|
522 | 520 | Record beginning, middle |
|
523 | 521 | |
|
524 | 522 | $ hg record -d '14 0' -m middle-only plain <<EOF |
|
525 | 523 | > y |
|
526 | 524 | > y |
|
527 | 525 | > y |
|
528 | 526 | > n |
|
529 | 527 | > EOF |
|
530 | 528 | diff --git a/plain b/plain |
|
531 | 529 | 3 hunks, 7 lines changed |
|
532 | 530 | examine changes to 'plain'? [Ynesfdaq?] |
|
533 | 531 | @@ -1,2 +1,5 @@ |
|
534 | 532 | +1 |
|
535 | 533 | +2 |
|
536 | 534 | +3 |
|
537 | 535 | 4 |
|
538 | 536 | 5 |
|
539 | 537 | record change 1/3 to 'plain'? [Ynesfdaq?] |
|
540 | 538 | @@ -1,6 +4,8 @@ |
|
541 | 539 | 4 |
|
542 | 540 | 5 |
|
543 | 541 | +5.new |
|
544 | 542 | +5.reallynew |
|
545 | 543 | 6 |
|
546 | 544 | 7 |
|
547 | 545 | 8 |
|
548 | 546 | 9 |
|
549 | 547 | record change 2/3 to 'plain'? [Ynesfdaq?] |
|
550 | 548 | @@ -3,4 +8,6 @@ |
|
551 | 549 | 6 |
|
552 | 550 | 7 |
|
553 | 551 | 8 |
|
554 | 552 | 9 |
|
555 | 553 | +10 |
|
556 | 554 | +11 |
|
557 | 555 | record change 3/3 to 'plain'? [Ynesfdaq?] |
|
558 | 556 | |
|
559 | 557 | $ hg tip -p |
|
560 | 558 | changeset: 15:f34a7937ec33 |
|
561 | 559 | tag: tip |
|
562 | 560 | user: test |
|
563 | 561 | date: Thu Jan 01 00:00:14 1970 +0000 |
|
564 | 562 | summary: middle-only |
|
565 | 563 | |
|
566 | 564 | diff -r 82c065d0b850 -r f34a7937ec33 plain |
|
567 | 565 | --- a/plain Thu Jan 01 00:00:13 1970 +0000 |
|
568 | 566 | +++ b/plain Thu Jan 01 00:00:14 1970 +0000 |
|
569 | 567 | @@ -1,5 +1,10 @@ |
|
570 | 568 | +1 |
|
571 | 569 | +2 |
|
572 | 570 | +3 |
|
573 | 571 | 4 |
|
574 | 572 | 5 |
|
575 | 573 | +5.new |
|
576 | 574 | +5.reallynew |
|
577 | 575 | 6 |
|
578 | 576 | 7 |
|
579 | 577 | 8 |
|
580 | 578 | |
|
581 | 579 | |
|
582 | 580 | Record end |
|
583 | 581 | |
|
584 | 582 | $ hg record -d '15 0' -m end-only plain <<EOF |
|
585 | 583 | > y |
|
586 | 584 | > y |
|
587 | 585 | > EOF |
|
588 | 586 | diff --git a/plain b/plain |
|
589 | 587 | 1 hunks, 2 lines changed |
|
590 | 588 | examine changes to 'plain'? [Ynesfdaq?] |
|
591 | 589 | @@ -9,3 +9,5 @@ |
|
592 | 590 | 7 |
|
593 | 591 | 8 |
|
594 | 592 | 9 |
|
595 | 593 | +10 |
|
596 | 594 | +11 |
|
597 | 595 | record this change to 'plain'? [Ynesfdaq?] |
|
598 | 596 | |
|
599 | 597 | $ hg tip -p |
|
600 | 598 | changeset: 16:f9900b71a04c |
|
601 | 599 | tag: tip |
|
602 | 600 | user: test |
|
603 | 601 | date: Thu Jan 01 00:00:15 1970 +0000 |
|
604 | 602 | summary: end-only |
|
605 | 603 | |
|
606 | 604 | diff -r f34a7937ec33 -r f9900b71a04c plain |
|
607 | 605 | --- a/plain Thu Jan 01 00:00:14 1970 +0000 |
|
608 | 606 | +++ b/plain Thu Jan 01 00:00:15 1970 +0000 |
|
609 | 607 | @@ -9,3 +9,5 @@ |
|
610 | 608 | 7 |
|
611 | 609 | 8 |
|
612 | 610 | 9 |
|
613 | 611 | +10 |
|
614 | 612 | +11 |
|
615 | 613 | |
|
616 | 614 | |
|
617 | 615 | $ mkdir subdir |
|
618 | 616 | $ cd subdir |
|
619 | 617 | $ echo a > a |
|
620 | 618 | $ hg ci -d '16 0' -Amsubdir |
|
621 | 619 | adding subdir/a |
|
622 | 620 | |
|
623 | 621 | $ echo a >> a |
|
624 | 622 | $ hg record -d '16 0' -m subdir-change a <<EOF |
|
625 | 623 | > y |
|
626 | 624 | > y |
|
627 | 625 | > EOF |
|
628 | 626 | diff --git a/subdir/a b/subdir/a |
|
629 | 627 | 1 hunks, 1 lines changed |
|
630 | 628 | examine changes to 'subdir/a'? [Ynesfdaq?] |
|
631 | 629 | @@ -1,1 +1,2 @@ |
|
632 | 630 | a |
|
633 | 631 | +a |
|
634 | 632 | record this change to 'subdir/a'? [Ynesfdaq?] |
|
635 | 633 | |
|
636 | 634 | $ hg tip -p |
|
637 | 635 | changeset: 18:61be427a9deb |
|
638 | 636 | tag: tip |
|
639 | 637 | user: test |
|
640 | 638 | date: Thu Jan 01 00:00:16 1970 +0000 |
|
641 | 639 | summary: subdir-change |
|
642 | 640 | |
|
643 | 641 | diff -r a7ffae4d61cb -r 61be427a9deb subdir/a |
|
644 | 642 | --- a/subdir/a Thu Jan 01 00:00:16 1970 +0000 |
|
645 | 643 | +++ b/subdir/a Thu Jan 01 00:00:16 1970 +0000 |
|
646 | 644 | @@ -1,1 +1,2 @@ |
|
647 | 645 | a |
|
648 | 646 | +a |
|
649 | 647 | |
|
650 | 648 | |
|
651 | 649 | $ echo a > f1 |
|
652 | 650 | $ echo b > f2 |
|
653 | 651 | $ hg add f1 f2 |
|
654 | 652 | |
|
655 | 653 | $ hg ci -mz -d '17 0' |
|
656 | 654 | |
|
657 | 655 | $ echo a >> f1 |
|
658 | 656 | $ echo b >> f2 |
|
659 | 657 | |
|
660 | 658 | Help, quit |
|
661 | 659 | |
|
662 | 660 | $ hg record <<EOF |
|
663 | 661 | > ? |
|
664 | 662 | > q |
|
665 | 663 | > EOF |
|
666 | 664 | diff --git a/subdir/f1 b/subdir/f1 |
|
667 | 665 | 1 hunks, 1 lines changed |
|
668 | 666 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
669 | 667 | y - record this change |
|
670 | 668 | n - skip this change |
|
671 | 669 | e - edit this change manually |
|
672 | 670 | s - skip remaining changes to this file |
|
673 | 671 | f - record remaining changes to this file |
|
674 | 672 | d - done, skip remaining changes and files |
|
675 | 673 | a - record all changes to all remaining files |
|
676 | 674 | q - quit, recording no changes |
|
677 | 675 | ? - display help |
|
678 | 676 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
679 | 677 | abort: user quit |
|
680 | 678 | [255] |
|
681 | 679 | |
|
682 | 680 | Skip |
|
683 | 681 | |
|
684 | 682 | $ hg record <<EOF |
|
685 | 683 | > s |
|
686 | 684 | > EOF |
|
687 | 685 | diff --git a/subdir/f1 b/subdir/f1 |
|
688 | 686 | 1 hunks, 1 lines changed |
|
689 | 687 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
690 | 688 | diff --git a/subdir/f2 b/subdir/f2 |
|
691 | 689 | 1 hunks, 1 lines changed |
|
692 | 690 | examine changes to 'subdir/f2'? [Ynesfdaq?] abort: response expected |
|
693 | 691 | [255] |
|
694 | 692 | |
|
695 | 693 | No |
|
696 | 694 | |
|
697 | 695 | $ hg record <<EOF |
|
698 | 696 | > n |
|
699 | 697 | > EOF |
|
700 | 698 | diff --git a/subdir/f1 b/subdir/f1 |
|
701 | 699 | 1 hunks, 1 lines changed |
|
702 | 700 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
703 | 701 | diff --git a/subdir/f2 b/subdir/f2 |
|
704 | 702 | 1 hunks, 1 lines changed |
|
705 | 703 | examine changes to 'subdir/f2'? [Ynesfdaq?] abort: response expected |
|
706 | 704 | [255] |
|
707 | 705 | |
|
708 | 706 | f, quit |
|
709 | 707 | |
|
710 | 708 | $ hg record <<EOF |
|
711 | 709 | > f |
|
712 | 710 | > q |
|
713 | 711 | > EOF |
|
714 | 712 | diff --git a/subdir/f1 b/subdir/f1 |
|
715 | 713 | 1 hunks, 1 lines changed |
|
716 | 714 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
717 | 715 | diff --git a/subdir/f2 b/subdir/f2 |
|
718 | 716 | 1 hunks, 1 lines changed |
|
719 | 717 | examine changes to 'subdir/f2'? [Ynesfdaq?] |
|
720 | 718 | abort: user quit |
|
721 | 719 | [255] |
|
722 | 720 | |
|
723 | 721 | s, all |
|
724 | 722 | |
|
725 | 723 | $ hg record -d '18 0' -mx <<EOF |
|
726 | 724 | > s |
|
727 | 725 | > a |
|
728 | 726 | > EOF |
|
729 | 727 | diff --git a/subdir/f1 b/subdir/f1 |
|
730 | 728 | 1 hunks, 1 lines changed |
|
731 | 729 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
732 | 730 | diff --git a/subdir/f2 b/subdir/f2 |
|
733 | 731 | 1 hunks, 1 lines changed |
|
734 | 732 | examine changes to 'subdir/f2'? [Ynesfdaq?] |
|
735 | 733 | |
|
736 | 734 | $ hg tip -p |
|
737 | 735 | changeset: 20:b3df3dda369a |
|
738 | 736 | tag: tip |
|
739 | 737 | user: test |
|
740 | 738 | date: Thu Jan 01 00:00:18 1970 +0000 |
|
741 | 739 | summary: x |
|
742 | 740 | |
|
743 | 741 | diff -r 6e02d6c9906d -r b3df3dda369a subdir/f2 |
|
744 | 742 | --- a/subdir/f2 Thu Jan 01 00:00:17 1970 +0000 |
|
745 | 743 | +++ b/subdir/f2 Thu Jan 01 00:00:18 1970 +0000 |
|
746 | 744 | @@ -1,1 +1,2 @@ |
|
747 | 745 | b |
|
748 | 746 | +b |
|
749 | 747 | |
|
750 | 748 | |
|
751 | 749 | f |
|
752 | 750 | |
|
753 | 751 | $ hg record -d '19 0' -my <<EOF |
|
754 | 752 | > f |
|
755 | 753 | > EOF |
|
756 | 754 | diff --git a/subdir/f1 b/subdir/f1 |
|
757 | 755 | 1 hunks, 1 lines changed |
|
758 | 756 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
759 | 757 | |
|
760 | 758 | $ hg tip -p |
|
761 | 759 | changeset: 21:38ec577f126b |
|
762 | 760 | tag: tip |
|
763 | 761 | user: test |
|
764 | 762 | date: Thu Jan 01 00:00:19 1970 +0000 |
|
765 | 763 | summary: y |
|
766 | 764 | |
|
767 | 765 | diff -r b3df3dda369a -r 38ec577f126b subdir/f1 |
|
768 | 766 | --- a/subdir/f1 Thu Jan 01 00:00:18 1970 +0000 |
|
769 | 767 | +++ b/subdir/f1 Thu Jan 01 00:00:19 1970 +0000 |
|
770 | 768 | @@ -1,1 +1,2 @@ |
|
771 | 769 | a |
|
772 | 770 | +a |
|
773 | 771 | |
|
774 | 772 | |
|
775 | 773 | #if execbit |
|
776 | 774 | |
|
777 | 775 | Preserve chmod +x |
|
778 | 776 | |
|
779 | 777 | $ chmod +x f1 |
|
780 | 778 | $ echo a >> f1 |
|
781 | 779 | $ hg record -d '20 0' -mz <<EOF |
|
782 | 780 | > y |
|
783 | 781 | > y |
|
784 | 782 | > y |
|
785 | 783 | > EOF |
|
786 | 784 | diff --git a/subdir/f1 b/subdir/f1 |
|
787 | 785 | old mode 100644 |
|
788 | 786 | new mode 100755 |
|
789 | 787 | 1 hunks, 1 lines changed |
|
790 | 788 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
791 | 789 | @@ -1,2 +1,3 @@ |
|
792 | 790 | a |
|
793 | 791 | a |
|
794 | 792 | +a |
|
795 | 793 | record this change to 'subdir/f1'? [Ynesfdaq?] |
|
796 | 794 | |
|
797 | 795 | $ hg tip --config diff.git=True -p |
|
798 | 796 | changeset: 22:3261adceb075 |
|
799 | 797 | tag: tip |
|
800 | 798 | user: test |
|
801 | 799 | date: Thu Jan 01 00:00:20 1970 +0000 |
|
802 | 800 | summary: z |
|
803 | 801 | |
|
804 | 802 | diff --git a/subdir/f1 b/subdir/f1 |
|
805 | 803 | old mode 100644 |
|
806 | 804 | new mode 100755 |
|
807 | 805 | --- a/subdir/f1 |
|
808 | 806 | +++ b/subdir/f1 |
|
809 | 807 | @@ -1,2 +1,3 @@ |
|
810 | 808 | a |
|
811 | 809 | a |
|
812 | 810 | +a |
|
813 | 811 | |
|
814 | 812 | |
|
815 | 813 | Preserve execute permission on original |
|
816 | 814 | |
|
817 | 815 | $ echo b >> f1 |
|
818 | 816 | $ hg record -d '21 0' -maa <<EOF |
|
819 | 817 | > y |
|
820 | 818 | > y |
|
821 | 819 | > y |
|
822 | 820 | > EOF |
|
823 | 821 | diff --git a/subdir/f1 b/subdir/f1 |
|
824 | 822 | 1 hunks, 1 lines changed |
|
825 | 823 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
826 | 824 | @@ -1,3 +1,4 @@ |
|
827 | 825 | a |
|
828 | 826 | a |
|
829 | 827 | a |
|
830 | 828 | +b |
|
831 | 829 | record this change to 'subdir/f1'? [Ynesfdaq?] |
|
832 | 830 | |
|
833 | 831 | $ hg tip --config diff.git=True -p |
|
834 | 832 | changeset: 23:b429867550db |
|
835 | 833 | tag: tip |
|
836 | 834 | user: test |
|
837 | 835 | date: Thu Jan 01 00:00:21 1970 +0000 |
|
838 | 836 | summary: aa |
|
839 | 837 | |
|
840 | 838 | diff --git a/subdir/f1 b/subdir/f1 |
|
841 | 839 | --- a/subdir/f1 |
|
842 | 840 | +++ b/subdir/f1 |
|
843 | 841 | @@ -1,3 +1,4 @@ |
|
844 | 842 | a |
|
845 | 843 | a |
|
846 | 844 | a |
|
847 | 845 | +b |
|
848 | 846 | |
|
849 | 847 | |
|
850 | 848 | Preserve chmod -x |
|
851 | 849 | |
|
852 | 850 | $ chmod -x f1 |
|
853 | 851 | $ echo c >> f1 |
|
854 | 852 | $ hg record -d '22 0' -mab <<EOF |
|
855 | 853 | > y |
|
856 | 854 | > y |
|
857 | 855 | > y |
|
858 | 856 | > EOF |
|
859 | 857 | diff --git a/subdir/f1 b/subdir/f1 |
|
860 | 858 | old mode 100755 |
|
861 | 859 | new mode 100644 |
|
862 | 860 | 1 hunks, 1 lines changed |
|
863 | 861 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
864 | 862 | @@ -2,3 +2,4 @@ |
|
865 | 863 | a |
|
866 | 864 | a |
|
867 | 865 | b |
|
868 | 866 | +c |
|
869 | 867 | record this change to 'subdir/f1'? [Ynesfdaq?] |
|
870 | 868 | |
|
871 | 869 | $ hg tip --config diff.git=True -p |
|
872 | 870 | changeset: 24:0b082130c20a |
|
873 | 871 | tag: tip |
|
874 | 872 | user: test |
|
875 | 873 | date: Thu Jan 01 00:00:22 1970 +0000 |
|
876 | 874 | summary: ab |
|
877 | 875 | |
|
878 | 876 | diff --git a/subdir/f1 b/subdir/f1 |
|
879 | 877 | old mode 100755 |
|
880 | 878 | new mode 100644 |
|
881 | 879 | --- a/subdir/f1 |
|
882 | 880 | +++ b/subdir/f1 |
|
883 | 881 | @@ -2,3 +2,4 @@ |
|
884 | 882 | a |
|
885 | 883 | a |
|
886 | 884 | b |
|
887 | 885 | +c |
|
888 | 886 | |
|
889 | 887 | |
|
890 | 888 | #else |
|
891 | 889 | |
|
892 | 890 | Slightly bogus tests to get almost same repo structure as when x bit is used |
|
893 | 891 | - but with different hashes. |
|
894 | 892 | |
|
895 | 893 | Mock "Preserve chmod +x" |
|
896 | 894 | |
|
897 | 895 | $ echo a >> f1 |
|
898 | 896 | $ hg record -d '20 0' -mz <<EOF |
|
899 | 897 | > y |
|
900 | 898 | > y |
|
901 | 899 | > y |
|
902 | 900 | > EOF |
|
903 | 901 | diff --git a/subdir/f1 b/subdir/f1 |
|
904 | 902 | 1 hunks, 1 lines changed |
|
905 | 903 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
906 | 904 | @@ -1,2 +1,3 @@ |
|
907 | 905 | a |
|
908 | 906 | a |
|
909 | 907 | +a |
|
910 | 908 | record this change to 'subdir/f1'? [Ynesfdaq?] |
|
911 | 909 | |
|
912 | 910 | $ hg tip --config diff.git=True -p |
|
913 | 911 | changeset: 22:0d463bd428f5 |
|
914 | 912 | tag: tip |
|
915 | 913 | user: test |
|
916 | 914 | date: Thu Jan 01 00:00:20 1970 +0000 |
|
917 | 915 | summary: z |
|
918 | 916 | |
|
919 | 917 | diff --git a/subdir/f1 b/subdir/f1 |
|
920 | 918 | --- a/subdir/f1 |
|
921 | 919 | +++ b/subdir/f1 |
|
922 | 920 | @@ -1,2 +1,3 @@ |
|
923 | 921 | a |
|
924 | 922 | a |
|
925 | 923 | +a |
|
926 | 924 | |
|
927 | 925 | |
|
928 | 926 | Mock "Preserve execute permission on original" |
|
929 | 927 | |
|
930 | 928 | $ echo b >> f1 |
|
931 | 929 | $ hg record -d '21 0' -maa <<EOF |
|
932 | 930 | > y |
|
933 | 931 | > y |
|
934 | 932 | > y |
|
935 | 933 | > EOF |
|
936 | 934 | diff --git a/subdir/f1 b/subdir/f1 |
|
937 | 935 | 1 hunks, 1 lines changed |
|
938 | 936 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
939 | 937 | @@ -1,3 +1,4 @@ |
|
940 | 938 | a |
|
941 | 939 | a |
|
942 | 940 | a |
|
943 | 941 | +b |
|
944 | 942 | record this change to 'subdir/f1'? [Ynesfdaq?] |
|
945 | 943 | |
|
946 | 944 | $ hg tip --config diff.git=True -p |
|
947 | 945 | changeset: 23:0eab41a3e524 |
|
948 | 946 | tag: tip |
|
949 | 947 | user: test |
|
950 | 948 | date: Thu Jan 01 00:00:21 1970 +0000 |
|
951 | 949 | summary: aa |
|
952 | 950 | |
|
953 | 951 | diff --git a/subdir/f1 b/subdir/f1 |
|
954 | 952 | --- a/subdir/f1 |
|
955 | 953 | +++ b/subdir/f1 |
|
956 | 954 | @@ -1,3 +1,4 @@ |
|
957 | 955 | a |
|
958 | 956 | a |
|
959 | 957 | a |
|
960 | 958 | +b |
|
961 | 959 | |
|
962 | 960 | |
|
963 | 961 | Mock "Preserve chmod -x" |
|
964 | 962 | |
|
965 | 963 | $ chmod -x f1 |
|
966 | 964 | $ echo c >> f1 |
|
967 | 965 | $ hg record -d '22 0' -mab <<EOF |
|
968 | 966 | > y |
|
969 | 967 | > y |
|
970 | 968 | > y |
|
971 | 969 | > EOF |
|
972 | 970 | diff --git a/subdir/f1 b/subdir/f1 |
|
973 | 971 | 1 hunks, 1 lines changed |
|
974 | 972 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
975 | 973 | @@ -2,3 +2,4 @@ |
|
976 | 974 | a |
|
977 | 975 | a |
|
978 | 976 | b |
|
979 | 977 | +c |
|
980 | 978 | record this change to 'subdir/f1'? [Ynesfdaq?] |
|
981 | 979 | |
|
982 | 980 | $ hg tip --config diff.git=True -p |
|
983 | 981 | changeset: 24:f4f718f27b7c |
|
984 | 982 | tag: tip |
|
985 | 983 | user: test |
|
986 | 984 | date: Thu Jan 01 00:00:22 1970 +0000 |
|
987 | 985 | summary: ab |
|
988 | 986 | |
|
989 | 987 | diff --git a/subdir/f1 b/subdir/f1 |
|
990 | 988 | --- a/subdir/f1 |
|
991 | 989 | +++ b/subdir/f1 |
|
992 | 990 | @@ -2,3 +2,4 @@ |
|
993 | 991 | a |
|
994 | 992 | a |
|
995 | 993 | b |
|
996 | 994 | +c |
|
997 | 995 | |
|
998 | 996 | |
|
999 | 997 | #endif |
|
1000 | 998 | |
|
1001 | 999 | $ cd .. |
|
1002 | 1000 | |
|
1003 | 1001 | |
|
1004 | 1002 | Abort early when a merge is in progress |
|
1005 | 1003 | |
|
1006 | 1004 | $ hg up 4 |
|
1007 | 1005 | 1 files updated, 0 files merged, 6 files removed, 0 files unresolved |
|
1008 | 1006 | |
|
1009 | 1007 | $ touch iwillmergethat |
|
1010 | 1008 | $ hg add iwillmergethat |
|
1011 | 1009 | |
|
1012 | 1010 | $ hg branch thatbranch |
|
1013 | 1011 | marked working directory as branch thatbranch |
|
1014 | 1012 | (branches are permanent and global, did you want a bookmark?) |
|
1015 | 1013 | |
|
1016 | 1014 | $ hg ci -m'new head' |
|
1017 | 1015 | |
|
1018 | 1016 | $ hg up default |
|
1019 | 1017 | 6 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
1020 | 1018 | |
|
1021 | 1019 | $ hg merge thatbranch |
|
1022 | 1020 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1023 | 1021 | (branch merge, don't forget to commit) |
|
1024 | 1022 | |
|
1025 | 1023 | $ hg record -m'will abort' |
|
1026 | 1024 | abort: cannot partially commit a merge (use "hg commit" instead) |
|
1027 | 1025 | [255] |
|
1028 | 1026 | |
|
1029 | 1027 | $ hg up -C |
|
1030 | 1028 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1031 | 1029 | |
|
1032 | 1030 | Editing patch |
|
1033 | 1031 | |
|
1034 | $ cat > editor << '__EOF__' | |
|
1035 | > #!/bin/sh | |
|
1032 | $ cat > editor.sh << '__EOF__' | |
|
1036 | 1033 | > sed -e 7d -e '5s/^-/ /' "$1" > tmp |
|
1037 | 1034 | > mv tmp "$1" |
|
1038 | 1035 | > __EOF__ |
|
1039 | $ chmod +x editor | |
|
1040 | 1036 | $ cat > editedfile << '__EOF__' |
|
1041 | 1037 | > This is the first line |
|
1042 | 1038 | > This is the second line |
|
1043 | 1039 | > This is the third line |
|
1044 | 1040 | > __EOF__ |
|
1045 | 1041 | $ hg add editedfile |
|
1046 | 1042 | $ hg commit -medit-patch-1 |
|
1047 | 1043 | $ cat > editedfile << '__EOF__' |
|
1048 | 1044 | > This line has changed |
|
1049 | 1045 | > This change will be committed |
|
1050 | 1046 | > This is the third line |
|
1051 | 1047 | > __EOF__ |
|
1052 |
$ HGEDITOR=" |
|
|
1048 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg record -d '23 0' -medit-patch-2 <<EOF | |
|
1053 | 1049 | > y |
|
1054 | 1050 | > e |
|
1055 | 1051 | > EOF |
|
1056 | 1052 | diff --git a/editedfile b/editedfile |
|
1057 | 1053 | 1 hunks, 2 lines changed |
|
1058 | 1054 | examine changes to 'editedfile'? [Ynesfdaq?] |
|
1059 | 1055 | @@ -1,3 +1,3 @@ |
|
1060 | 1056 | -This is the first line |
|
1061 | 1057 | -This is the second line |
|
1062 | 1058 | +This line has changed |
|
1063 | 1059 | +This change will be committed |
|
1064 | 1060 | This is the third line |
|
1065 | 1061 | record this change to 'editedfile'? [Ynesfdaq?] |
|
1066 | 1062 | $ cat editedfile |
|
1067 | 1063 | This line has changed |
|
1068 | 1064 | This change will be committed |
|
1069 | 1065 | This is the third line |
|
1070 | 1066 | $ hg cat -r tip editedfile |
|
1071 | 1067 | This is the first line |
|
1072 | 1068 | This change will be committed |
|
1073 | 1069 | This is the third line |
|
1074 | 1070 | $ hg revert editedfile |
|
1075 | 1071 | |
|
1076 | 1072 | Trying to edit patch for whole file |
|
1077 | 1073 | |
|
1078 | 1074 | $ echo "This is the fourth line" >> editedfile |
|
1079 | 1075 | $ hg record <<EOF |
|
1080 | 1076 | > e |
|
1081 | 1077 | > q |
|
1082 | 1078 | > EOF |
|
1083 | 1079 | diff --git a/editedfile b/editedfile |
|
1084 | 1080 | 1 hunks, 1 lines changed |
|
1085 | 1081 | examine changes to 'editedfile'? [Ynesfdaq?] |
|
1086 | 1082 | cannot edit patch for whole file |
|
1087 | 1083 | examine changes to 'editedfile'? [Ynesfdaq?] |
|
1088 | 1084 | abort: user quit |
|
1089 | 1085 | [255] |
|
1090 | 1086 | $ hg revert editedfile |
|
1091 | 1087 | |
|
1092 | 1088 | Removing changes from patch |
|
1093 | 1089 | |
|
1094 | 1090 | $ sed -e '3s/third/second/' -e '2s/will/will not/' -e 1d editedfile > tmp |
|
1095 | 1091 | $ mv tmp editedfile |
|
1096 | 1092 | $ echo "This line has been added" >> editedfile |
|
1097 | $ cat > editor << '__EOF__' | |
|
1098 | > #!/bin/sh | |
|
1093 | $ cat > editor.sh << '__EOF__' | |
|
1099 | 1094 | > sed -e 's/^[-+]/ /' "$1" > tmp |
|
1100 | 1095 | > mv tmp "$1" |
|
1101 | 1096 | > __EOF__ |
|
1102 | $ chmod +x editor | |
|
1103 | $ HGEDITOR="'`pwd`'"/editor hg record <<EOF | |
|
1097 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg record <<EOF | |
|
1104 | 1098 | > y |
|
1105 | 1099 | > e |
|
1106 | 1100 | > EOF |
|
1107 | 1101 | diff --git a/editedfile b/editedfile |
|
1108 | 1102 | 1 hunks, 3 lines changed |
|
1109 | 1103 | examine changes to 'editedfile'? [Ynesfdaq?] |
|
1110 | 1104 | @@ -1,3 +1,3 @@ |
|
1111 | 1105 | -This is the first line |
|
1112 | 1106 | -This change will be committed |
|
1113 | 1107 | -This is the third line |
|
1114 | 1108 | +This change will not be committed |
|
1115 | 1109 | +This is the second line |
|
1116 | 1110 | +This line has been added |
|
1117 | 1111 | record this change to 'editedfile'? [Ynesfdaq?] |
|
1118 | 1112 | no changes to record |
|
1119 | 1113 | $ cat editedfile |
|
1120 | 1114 | This change will not be committed |
|
1121 | 1115 | This is the second line |
|
1122 | 1116 | This line has been added |
|
1123 | 1117 | $ hg cat -r tip editedfile |
|
1124 | 1118 | This is the first line |
|
1125 | 1119 | This change will be committed |
|
1126 | 1120 | This is the third line |
|
1127 | 1121 | $ hg revert editedfile |
|
1128 | 1122 | |
|
1129 | 1123 | Invalid patch |
|
1130 | 1124 | |
|
1131 | 1125 | $ sed -e '3s/third/second/' -e '2s/will/will not/' -e 1d editedfile > tmp |
|
1132 | 1126 | $ mv tmp editedfile |
|
1133 | 1127 | $ echo "This line has been added" >> editedfile |
|
1134 | $ cat > editor << '__EOF__' | |
|
1135 | > #!/bin/sh | |
|
1128 | $ cat > editor.sh << '__EOF__' | |
|
1136 | 1129 | > sed s/This/That/ "$1" > tmp |
|
1137 | 1130 | > mv tmp "$1" |
|
1138 | 1131 | > __EOF__ |
|
1139 | $ chmod +x editor | |
|
1140 | $ HGEDITOR="'`pwd`'"/editor hg record <<EOF | |
|
1132 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg record <<EOF | |
|
1141 | 1133 | > y |
|
1142 | 1134 | > e |
|
1143 | 1135 | > EOF |
|
1144 | 1136 | diff --git a/editedfile b/editedfile |
|
1145 | 1137 | 1 hunks, 3 lines changed |
|
1146 | 1138 | examine changes to 'editedfile'? [Ynesfdaq?] |
|
1147 | 1139 | @@ -1,3 +1,3 @@ |
|
1148 | 1140 | -This is the first line |
|
1149 | 1141 | -This change will be committed |
|
1150 | 1142 | -This is the third line |
|
1151 | 1143 | +This change will not be committed |
|
1152 | 1144 | +This is the second line |
|
1153 | 1145 | +This line has been added |
|
1154 | 1146 | record this change to 'editedfile'? [Ynesfdaq?] |
|
1155 | 1147 | patching file editedfile |
|
1156 | 1148 | Hunk #1 FAILED at 0 |
|
1157 | 1149 | 1 out of 1 hunks FAILED -- saving rejects to file editedfile.rej |
|
1158 | 1150 | abort: patch failed to apply |
|
1159 | 1151 | [255] |
|
1160 | 1152 | $ cat editedfile |
|
1161 | 1153 | This change will not be committed |
|
1162 | 1154 | This is the second line |
|
1163 | 1155 | This line has been added |
|
1164 | 1156 | $ hg cat -r tip editedfile |
|
1165 | 1157 | This is the first line |
|
1166 | 1158 | This change will be committed |
|
1167 | 1159 | This is the third line |
|
1168 | 1160 | $ cat editedfile.rej |
|
1169 | 1161 | --- editedfile |
|
1170 | 1162 | +++ editedfile |
|
1171 | 1163 | @@ -1,3 +1,3 @@ |
|
1172 | 1164 | -That is the first line |
|
1173 | 1165 | -That change will be committed |
|
1174 | 1166 | -That is the third line |
|
1175 | 1167 | +That change will not be committed |
|
1176 | 1168 | +That is the second line |
|
1177 | 1169 | +That line has been added |
|
1178 | 1170 | $ hg up -C |
|
1179 | 1171 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1180 | 1172 | |
|
1181 | 1173 | With win32text |
|
1182 | 1174 | |
|
1183 | 1175 | $ echo '[extensions]' >> .hg/hgrc |
|
1184 | 1176 | $ echo 'win32text = ' >> .hg/hgrc |
|
1185 | 1177 | $ echo '[decode]' >> .hg/hgrc |
|
1186 | 1178 | $ echo '** = cleverdecode:' >> .hg/hgrc |
|
1187 | 1179 | $ echo '[encode]' >> .hg/hgrc |
|
1188 | 1180 | $ echo '** = cleverencode:' >> .hg/hgrc |
|
1189 | 1181 | $ echo '[patch]' >> .hg/hgrc |
|
1190 | 1182 | $ echo 'eol = crlf' >> .hg/hgrc |
|
1191 | 1183 | |
|
1192 | 1184 | Ignore win32text deprecation warning for now: |
|
1193 | 1185 | |
|
1194 | 1186 | $ echo '[win32text]' >> .hg/hgrc |
|
1195 | 1187 | $ echo 'warn = no' >> .hg/hgrc |
|
1196 | 1188 | |
|
1197 | 1189 | $ echo d >> subdir/f1 |
|
1198 | 1190 | $ hg record -d '24 0' -mw1 <<EOF |
|
1199 | 1191 | > y |
|
1200 | 1192 | > y |
|
1201 | 1193 | > EOF |
|
1202 | 1194 | diff --git a/subdir/f1 b/subdir/f1 |
|
1203 | 1195 | 1 hunks, 1 lines changed |
|
1204 | 1196 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
1205 | 1197 | @@ -3,3 +3,4 @@ |
|
1206 | 1198 | a |
|
1207 | 1199 | b |
|
1208 | 1200 | c |
|
1209 | 1201 | +d |
|
1210 | 1202 | record this change to 'subdir/f1'? [Ynesfdaq?] |
|
1211 | 1203 | |
|
1212 | 1204 | $ hg tip -p |
|
1213 | 1205 | changeset: 28:* (glob) |
|
1214 | 1206 | tag: tip |
|
1215 | 1207 | user: test |
|
1216 | 1208 | date: Thu Jan 01 00:00:24 1970 +0000 |
|
1217 | 1209 | summary: w1 |
|
1218 | 1210 | |
|
1219 | 1211 | diff -r ???????????? -r ???????????? subdir/f1 (glob) |
|
1220 | 1212 | --- a/subdir/f1 Thu Jan 01 00:00:23 1970 +0000 |
|
1221 | 1213 | +++ b/subdir/f1 Thu Jan 01 00:00:24 1970 +0000 |
|
1222 | 1214 | @@ -3,3 +3,4 @@ |
|
1223 | 1215 | a |
|
1224 | 1216 | b |
|
1225 | 1217 | c |
|
1226 | 1218 | +d |
|
1227 | 1219 |
@@ -1,187 +1,185 b'' | |||
|
1 | 1 | $ "$TESTDIR/hghave" serve || exit 80 |
|
2 | 2 | |
|
3 | 3 | setup repo |
|
4 | 4 | $ hg init t |
|
5 | 5 | $ cd t |
|
6 | 6 | $ echo a > a |
|
7 | 7 | $ hg commit -Am'add a' |
|
8 | 8 | adding a |
|
9 | 9 | $ hg verify |
|
10 | 10 | checking changesets |
|
11 | 11 | checking manifests |
|
12 | 12 | crosschecking files in changesets and manifests |
|
13 | 13 | checking files |
|
14 | 14 | 1 files, 1 changesets, 1 total revisions |
|
15 | 15 | $ hg parents |
|
16 | 16 | changeset: 0:1f0dee641bb7 |
|
17 | 17 | tag: tip |
|
18 | 18 | user: test |
|
19 | 19 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
20 | 20 | summary: add a |
|
21 | 21 | |
|
22 | 22 | |
|
23 | 23 | rollback to null revision |
|
24 | 24 | $ hg status |
|
25 | 25 | $ hg rollback |
|
26 | 26 | repository tip rolled back to revision -1 (undo commit) |
|
27 | 27 | working directory now based on revision -1 |
|
28 | 28 | $ hg verify |
|
29 | 29 | checking changesets |
|
30 | 30 | checking manifests |
|
31 | 31 | crosschecking files in changesets and manifests |
|
32 | 32 | checking files |
|
33 | 33 | 0 files, 0 changesets, 0 total revisions |
|
34 | 34 | $ hg parents |
|
35 | 35 | $ hg status |
|
36 | 36 | A a |
|
37 | 37 | |
|
38 | 38 | Two changesets this time so we rollback to a real changeset |
|
39 | 39 | $ hg commit -m'add a again' |
|
40 | 40 | $ echo a >> a |
|
41 | 41 | $ hg commit -m'modify a' |
|
42 | 42 | |
|
43 | 43 | Test issue 902 (current branch is preserved) |
|
44 | 44 | $ hg branch test |
|
45 | 45 | marked working directory as branch test |
|
46 | 46 | (branches are permanent and global, did you want a bookmark?) |
|
47 | 47 | $ hg rollback |
|
48 | 48 | repository tip rolled back to revision 0 (undo commit) |
|
49 | 49 | working directory now based on revision 0 |
|
50 | 50 | $ hg branch |
|
51 | 51 | default |
|
52 | 52 | |
|
53 | 53 | Test issue 1635 (commit message saved) |
|
54 | 54 | $ cat .hg/last-message.txt ; echo |
|
55 | 55 | modify a |
|
56 | 56 | |
|
57 | 57 | Test rollback of hg before issue 902 was fixed |
|
58 | 58 | |
|
59 | 59 | $ hg commit -m "test3" |
|
60 | 60 | $ hg branch test |
|
61 | 61 | marked working directory as branch test |
|
62 | 62 | (branches are permanent and global, did you want a bookmark?) |
|
63 | 63 | $ rm .hg/undo.branch |
|
64 | 64 | $ hg rollback |
|
65 | 65 | repository tip rolled back to revision 0 (undo commit) |
|
66 | 66 | named branch could not be reset: current branch is still 'test' |
|
67 | 67 | working directory now based on revision 0 |
|
68 | 68 | $ hg branch |
|
69 | 69 | test |
|
70 | 70 | |
|
71 | 71 | working dir unaffected by rollback: do not restore dirstate et. al. |
|
72 | 72 | $ hg log --template '{rev} {branch} {desc|firstline}\n' |
|
73 | 73 | 0 default add a again |
|
74 | 74 | $ hg status |
|
75 | 75 | M a |
|
76 | 76 | $ hg bookmark foo |
|
77 | 77 | $ hg commit -m'modify a again' |
|
78 | 78 | $ echo b > b |
|
79 | 79 | $ hg commit -Am'add b' |
|
80 | 80 | adding b |
|
81 | 81 | $ hg log --template '{rev} {branch} {desc|firstline}\n' |
|
82 | 82 | 2 test add b |
|
83 | 83 | 1 test modify a again |
|
84 | 84 | 0 default add a again |
|
85 | 85 | $ hg update default |
|
86 | 86 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
87 | 87 | $ hg bookmark bar |
|
88 | 88 | $ cat .hg/undo.branch ; echo |
|
89 | 89 | test |
|
90 | 90 | $ hg rollback -f |
|
91 | 91 | repository tip rolled back to revision 1 (undo commit) |
|
92 | 92 | $ hg id -n |
|
93 | 93 | 0 |
|
94 | 94 | $ hg branch |
|
95 | 95 | default |
|
96 | 96 | $ cat .hg/bookmarks.current ; echo |
|
97 | 97 | bar |
|
98 | 98 | $ hg bookmark --delete foo |
|
99 | 99 | |
|
100 | 100 | rollback by pretxncommit saves commit message (issue 1635) |
|
101 | 101 | |
|
102 | 102 | $ echo a >> a |
|
103 | 103 | $ hg --config hooks.pretxncommit=false commit -m"precious commit message" |
|
104 | 104 | transaction abort! |
|
105 | 105 | rollback completed |
|
106 | 106 | abort: pretxncommit hook exited with status * (glob) |
|
107 | 107 | [255] |
|
108 | 108 | $ cat .hg/last-message.txt ; echo |
|
109 | 109 | precious commit message |
|
110 | 110 | |
|
111 | 111 | same thing, but run $EDITOR |
|
112 | 112 | |
|
113 | $ cat > editor << '__EOF__' | |
|
114 | > #!/bin/sh | |
|
113 | $ cat > editor.sh << '__EOF__' | |
|
115 | 114 | > echo "another precious commit message" > "$1" |
|
116 | 115 | > __EOF__ |
|
117 | $ chmod +x editor | |
|
118 | $ HGEDITOR="'`pwd`'"/editor hg --config hooks.pretxncommit=false commit 2>&1 | |
|
116 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg --config hooks.pretxncommit=false commit 2>&1 | |
|
119 | 117 | transaction abort! |
|
120 | 118 | rollback completed |
|
121 | 119 | note: commit message saved in .hg/last-message.txt |
|
122 | 120 | abort: pretxncommit hook exited with status * (glob) |
|
123 | 121 | [255] |
|
124 | 122 | $ cat .hg/last-message.txt |
|
125 | 123 | another precious commit message |
|
126 | 124 | |
|
127 | 125 | test rollback on served repository |
|
128 | 126 | |
|
129 | 127 | $ hg commit -m "precious commit message" |
|
130 | 128 | $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
131 | 129 | $ cat hg.pid >> $DAEMON_PIDS |
|
132 | 130 | $ cd .. |
|
133 | 131 | $ hg clone http://localhost:$HGPORT u |
|
134 | 132 | requesting all changes |
|
135 | 133 | adding changesets |
|
136 | 134 | adding manifests |
|
137 | 135 | adding file changes |
|
138 | 136 | added 3 changesets with 2 changes to 1 files (+1 heads) |
|
139 | 137 | updating to branch default |
|
140 | 138 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
141 | 139 | $ cd u |
|
142 | 140 | $ hg id default |
|
143 | 141 | 068774709090 |
|
144 | 142 | |
|
145 | 143 | now rollback and observe that 'hg serve' reloads the repository and |
|
146 | 144 | presents the correct tip changeset: |
|
147 | 145 | |
|
148 | 146 | $ hg -R ../t rollback |
|
149 | 147 | repository tip rolled back to revision 1 (undo commit) |
|
150 | 148 | working directory now based on revision 0 |
|
151 | 149 | $ hg id default |
|
152 | 150 | 791dd2169706 |
|
153 | 151 | |
|
154 | 152 | update to older changeset and then refuse rollback, because |
|
155 | 153 | that would lose data (issue2998) |
|
156 | 154 | $ cd ../t |
|
157 | 155 | $ hg -q update |
|
158 | 156 | $ rm `hg status -un` |
|
159 | 157 | $ template='{rev}:{node|short} [{branch}] {desc|firstline}\n' |
|
160 | 158 | $ echo 'valuable new file' > b |
|
161 | 159 | $ echo 'valuable modification' >> a |
|
162 | 160 | $ hg commit -A -m'a valuable change' |
|
163 | 161 | adding b |
|
164 | 162 | $ hg update 0 |
|
165 | 163 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
166 | 164 | $ hg rollback |
|
167 | 165 | abort: rollback of last commit while not checked out may lose data |
|
168 | 166 | (use -f to force) |
|
169 | 167 | [255] |
|
170 | 168 | $ hg tip -q |
|
171 | 169 | 2:4d9cd3795eea |
|
172 | 170 | $ hg rollback -f |
|
173 | 171 | repository tip rolled back to revision 1 (undo commit) |
|
174 | 172 | $ hg status |
|
175 | 173 | $ hg log --removed b # yep, it's gone |
|
176 | 174 | |
|
177 | 175 | same again, but emulate an old client that doesn't write undo.desc |
|
178 | 176 | $ hg -q update |
|
179 | 177 | $ echo 'valuable modification redux' >> a |
|
180 | 178 | $ hg commit -m'a valuable change redux' |
|
181 | 179 | $ rm .hg/undo.desc |
|
182 | 180 | $ hg update 0 |
|
183 | 181 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
184 | 182 | $ hg rollback |
|
185 | 183 | rolling back unknown transaction |
|
186 | 184 | $ cat a |
|
187 | 185 | a |
@@ -1,315 +1,311 b'' | |||
|
1 | $ "$TESTDIR/hghave" system-sh || exit 80 | |
|
2 | ||
|
3 | 1 |
|
|
4 | 2 | $ cd test |
|
5 | 3 | |
|
6 | 4 | $ echo a > a |
|
7 | 5 | $ hg add a |
|
8 | 6 | $ hg commit -m "test" |
|
9 | 7 | $ hg history |
|
10 | 8 | changeset: 0:acb14030fe0a |
|
11 | 9 | tag: tip |
|
12 | 10 | user: test |
|
13 | 11 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
14 | 12 | summary: test |
|
15 | 13 | |
|
16 | 14 | |
|
17 | 15 | $ hg tag ' ' |
|
18 | 16 | abort: tag names cannot consist entirely of whitespace |
|
19 | 17 | [255] |
|
20 | 18 | |
|
21 | 19 | $ hg tag "bleah" |
|
22 | 20 | $ hg history |
|
23 | 21 | changeset: 1:d4f0d2909abc |
|
24 | 22 | tag: tip |
|
25 | 23 | user: test |
|
26 | 24 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
27 | 25 | summary: Added tag bleah for changeset acb14030fe0a |
|
28 | 26 | |
|
29 | 27 | changeset: 0:acb14030fe0a |
|
30 | 28 | tag: bleah |
|
31 | 29 | user: test |
|
32 | 30 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
33 | 31 | summary: test |
|
34 | 32 | |
|
35 | 33 | |
|
36 | 34 | $ echo foo >> .hgtags |
|
37 | 35 | $ hg tag "bleah2" |
|
38 | 36 | abort: working copy of .hgtags is changed (please commit .hgtags manually) |
|
39 | 37 | [255] |
|
40 | 38 | |
|
41 | 39 | $ hg revert .hgtags |
|
42 | 40 | $ hg tag -r 0 x y z y y z |
|
43 | 41 | abort: tag names must be unique |
|
44 | 42 | [255] |
|
45 | 43 | $ hg tag tap nada dot tip null . |
|
46 | 44 | abort: the name 'tip' is reserved |
|
47 | 45 | [255] |
|
48 | 46 | $ hg tag "bleah" |
|
49 | 47 | abort: tag 'bleah' already exists (use -f to force) |
|
50 | 48 | [255] |
|
51 | 49 | $ hg tag "blecch" "bleah" |
|
52 | 50 | abort: tag 'bleah' already exists (use -f to force) |
|
53 | 51 | [255] |
|
54 | 52 | |
|
55 | 53 | $ hg tag --remove "blecch" |
|
56 | 54 | abort: tag 'blecch' does not exist |
|
57 | 55 | [255] |
|
58 | 56 | $ hg tag --remove "bleah" "blecch" "blough" |
|
59 | 57 | abort: tag 'blecch' does not exist |
|
60 | 58 | [255] |
|
61 | 59 | |
|
62 | 60 | $ hg tag -r 0 "bleah0" |
|
63 | 61 | $ hg tag -l -r 1 "bleah1" |
|
64 | 62 | $ hg tag gack gawk gorp |
|
65 | 63 | $ hg tag -f gack |
|
66 | 64 | $ hg tag --remove gack gorp |
|
67 | 65 | |
|
68 | 66 | $ hg tag "bleah " |
|
69 | 67 | abort: tag 'bleah' already exists (use -f to force) |
|
70 | 68 | [255] |
|
71 | 69 | $ hg tag " bleah" |
|
72 | 70 | abort: tag 'bleah' already exists (use -f to force) |
|
73 | 71 | [255] |
|
74 | 72 | $ hg tag " bleah" |
|
75 | 73 | abort: tag 'bleah' already exists (use -f to force) |
|
76 | 74 | [255] |
|
77 | 75 | $ hg tag -r 0 " bleahbleah " |
|
78 | 76 | $ hg tag -r 0 " bleah bleah " |
|
79 | 77 | |
|
80 | 78 | $ cat .hgtags |
|
81 | 79 | acb14030fe0a21b60322c440ad2d20cf7685a376 bleah |
|
82 | 80 | acb14030fe0a21b60322c440ad2d20cf7685a376 bleah0 |
|
83 | 81 | 336fccc858a4eb69609a291105009e484a6b6b8d gack |
|
84 | 82 | 336fccc858a4eb69609a291105009e484a6b6b8d gawk |
|
85 | 83 | 336fccc858a4eb69609a291105009e484a6b6b8d gorp |
|
86 | 84 | 336fccc858a4eb69609a291105009e484a6b6b8d gack |
|
87 | 85 | 799667b6f2d9b957f73fa644a918c2df22bab58f gack |
|
88 | 86 | 799667b6f2d9b957f73fa644a918c2df22bab58f gack |
|
89 | 87 | 0000000000000000000000000000000000000000 gack |
|
90 | 88 | 336fccc858a4eb69609a291105009e484a6b6b8d gorp |
|
91 | 89 | 0000000000000000000000000000000000000000 gorp |
|
92 | 90 | acb14030fe0a21b60322c440ad2d20cf7685a376 bleahbleah |
|
93 | 91 | acb14030fe0a21b60322c440ad2d20cf7685a376 bleah bleah |
|
94 | 92 | |
|
95 | 93 | $ cat .hg/localtags |
|
96 | 94 | d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1 |
|
97 | 95 | |
|
98 | 96 | tagging on a non-head revision |
|
99 | 97 | |
|
100 | 98 | $ hg update 0 |
|
101 | 99 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
102 | 100 | $ hg tag -l localblah |
|
103 | 101 | $ hg tag "foobar" |
|
104 | 102 | abort: not at a branch head (use -f to force) |
|
105 | 103 | [255] |
|
106 | 104 | $ hg tag -f "foobar" |
|
107 | 105 | $ cat .hgtags |
|
108 | 106 | acb14030fe0a21b60322c440ad2d20cf7685a376 foobar |
|
109 | 107 | $ cat .hg/localtags |
|
110 | 108 | d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1 |
|
111 | 109 | acb14030fe0a21b60322c440ad2d20cf7685a376 localblah |
|
112 | 110 | |
|
113 | 111 | $ hg tag -l 'xx |
|
114 | 112 | > newline' |
|
115 | 113 | abort: '\n' cannot be used in a tag name |
|
116 | 114 | [255] |
|
117 | 115 | $ hg tag -l 'xx:xx' |
|
118 | 116 | abort: ':' cannot be used in a tag name |
|
119 | 117 | [255] |
|
120 | 118 | |
|
121 | 119 | cloning local tags |
|
122 | 120 | |
|
123 | 121 | $ cd .. |
|
124 | 122 | $ hg -R test log -r0:5 |
|
125 | 123 | changeset: 0:acb14030fe0a |
|
126 | 124 | tag: bleah |
|
127 | 125 | tag: bleah bleah |
|
128 | 126 | tag: bleah0 |
|
129 | 127 | tag: bleahbleah |
|
130 | 128 | tag: foobar |
|
131 | 129 | tag: localblah |
|
132 | 130 | user: test |
|
133 | 131 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
134 | 132 | summary: test |
|
135 | 133 | |
|
136 | 134 | changeset: 1:d4f0d2909abc |
|
137 | 135 | tag: bleah1 |
|
138 | 136 | user: test |
|
139 | 137 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
140 | 138 | summary: Added tag bleah for changeset acb14030fe0a |
|
141 | 139 | |
|
142 | 140 | changeset: 2:336fccc858a4 |
|
143 | 141 | tag: gawk |
|
144 | 142 | user: test |
|
145 | 143 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
146 | 144 | summary: Added tag bleah0 for changeset acb14030fe0a |
|
147 | 145 | |
|
148 | 146 | changeset: 3:799667b6f2d9 |
|
149 | 147 | user: test |
|
150 | 148 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
151 | 149 | summary: Added tag gack, gawk, gorp for changeset 336fccc858a4 |
|
152 | 150 | |
|
153 | 151 | changeset: 4:154eeb7c0138 |
|
154 | 152 | user: test |
|
155 | 153 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
156 | 154 | summary: Added tag gack for changeset 799667b6f2d9 |
|
157 | 155 | |
|
158 | 156 | changeset: 5:b4bb47aaff09 |
|
159 | 157 | user: test |
|
160 | 158 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
161 | 159 | summary: Removed tag gack, gorp |
|
162 | 160 | |
|
163 | 161 | $ hg clone -q -rbleah1 test test1 |
|
164 | 162 | $ hg -R test1 parents --style=compact |
|
165 | 163 | 1[tip] d4f0d2909abc 1970-01-01 00:00 +0000 test |
|
166 | 164 | Added tag bleah for changeset acb14030fe0a |
|
167 | 165 | |
|
168 | 166 | $ hg clone -q -r5 test#bleah1 test2 |
|
169 | 167 | $ hg -R test2 parents --style=compact |
|
170 | 168 | 5[tip] b4bb47aaff09 1970-01-01 00:00 +0000 test |
|
171 | 169 | Removed tag gack, gorp |
|
172 | 170 | |
|
173 | 171 | $ hg clone -q -U test#bleah1 test3 |
|
174 | 172 | $ hg -R test3 parents --style=compact |
|
175 | 173 | |
|
176 | 174 | $ cd test |
|
177 | 175 | |
|
178 | 176 | Issue601: hg tag doesn't do the right thing if .hgtags or localtags |
|
179 | 177 | doesn't end with EOL |
|
180 | 178 | |
|
181 | 179 | $ python << EOF |
|
182 | 180 | > f = file('.hg/localtags'); last = f.readlines()[-1][:-1]; f.close() |
|
183 | 181 | > f = file('.hg/localtags', 'w'); f.write(last); f.close() |
|
184 | 182 | > EOF |
|
185 | 183 | $ cat .hg/localtags; echo |
|
186 | 184 | acb14030fe0a21b60322c440ad2d20cf7685a376 localblah |
|
187 | 185 | $ hg tag -l localnewline |
|
188 | 186 | $ cat .hg/localtags; echo |
|
189 | 187 | acb14030fe0a21b60322c440ad2d20cf7685a376 localblah |
|
190 | 188 | c2899151f4e76890c602a2597a650a72666681bf localnewline |
|
191 | 189 | |
|
192 | 190 | |
|
193 | 191 | $ python << EOF |
|
194 | 192 | > f = file('.hgtags'); last = f.readlines()[-1][:-1]; f.close() |
|
195 | 193 | > f = file('.hgtags', 'w'); f.write(last); f.close() |
|
196 | 194 | > EOF |
|
197 | 195 | $ hg ci -m'broken manual edit of .hgtags' |
|
198 | 196 | $ cat .hgtags; echo |
|
199 | 197 | acb14030fe0a21b60322c440ad2d20cf7685a376 foobar |
|
200 | 198 | $ hg tag newline |
|
201 | 199 | $ cat .hgtags; echo |
|
202 | 200 | acb14030fe0a21b60322c440ad2d20cf7685a376 foobar |
|
203 | 201 | a0eea09de1eeec777b46f2085260a373b2fbc293 newline |
|
204 | 202 | |
|
205 | 203 | |
|
206 | 204 | tag and branch using same name |
|
207 | 205 | |
|
208 | 206 | $ hg branch tag-and-branch-same-name |
|
209 | 207 | marked working directory as branch tag-and-branch-same-name |
|
210 | 208 | (branches are permanent and global, did you want a bookmark?) |
|
211 | 209 | $ hg ci -m"discouraged" |
|
212 | 210 | $ hg tag tag-and-branch-same-name |
|
213 | 211 | warning: tag tag-and-branch-same-name conflicts with existing branch name |
|
214 | 212 | |
|
215 | 213 | test custom commit messages |
|
216 | 214 | |
|
217 | $ cat > editor << '__EOF__' | |
|
218 | > #!/bin/sh | |
|
215 | $ cat > editor.sh << '__EOF__' | |
|
219 | 216 | > echo "custom tag message" > "$1" |
|
220 | 217 | > echo "second line" >> "$1" |
|
221 | 218 | > __EOF__ |
|
222 | $ chmod +x editor | |
|
223 | $ HGEDITOR="'`pwd`'"/editor hg tag custom-tag -e | |
|
219 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg tag custom-tag -e | |
|
224 | 220 | $ hg log -l1 --template "{desc}\n" |
|
225 | 221 | custom tag message |
|
226 | 222 | second line |
|
227 | 223 | |
|
228 | 224 | |
|
229 | 225 | local tag with .hgtags modified |
|
230 | 226 | |
|
231 | 227 | $ hg tag hgtags-modified |
|
232 | 228 | $ hg rollback |
|
233 | 229 | repository tip rolled back to revision 13 (undo commit) |
|
234 | 230 | working directory now based on revision 13 |
|
235 | 231 | $ hg st |
|
236 | 232 | M .hgtags |
|
237 | 233 | ? .hgtags.orig |
|
238 | ? editor | |
|
234 | ? editor.sh | |
|
239 | 235 | $ hg tag --local baz |
|
240 | 236 | $ hg revert --no-backup .hgtags |
|
241 | 237 | |
|
242 | 238 | |
|
243 | 239 | tagging when at named-branch-head that's not a topo-head |
|
244 | 240 | |
|
245 | 241 | $ hg up default |
|
246 | 242 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
247 | 243 | $ hg merge -t internal:local |
|
248 | 244 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
249 | 245 | (branch merge, don't forget to commit) |
|
250 | 246 | $ hg ci -m 'merge named branch' |
|
251 | 247 | $ hg up 13 |
|
252 | 248 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
253 | 249 | $ hg tag new-topo-head |
|
254 | 250 | |
|
255 | 251 | |
|
256 | 252 | tagging on null rev |
|
257 | 253 | |
|
258 | 254 | $ hg up null |
|
259 | 255 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
260 | 256 | $ hg tag nullrev |
|
261 | 257 | abort: not at a branch head (use -f to force) |
|
262 | 258 | [255] |
|
263 | 259 | |
|
264 | 260 | $ hg init empty |
|
265 | 261 | $ hg tag -R empty nullrev |
|
266 | 262 | |
|
267 | 263 | $ cd .. |
|
268 | 264 | |
|
269 | 265 | tagging on an uncommitted merge (issue2542) |
|
270 | 266 | |
|
271 | 267 | $ hg init repo-tag-uncommitted-merge |
|
272 | 268 | $ cd repo-tag-uncommitted-merge |
|
273 | 269 | $ echo c1 > f1 |
|
274 | 270 | $ hg ci -Am0 |
|
275 | 271 | adding f1 |
|
276 | 272 | $ echo c2 > f2 |
|
277 | 273 | $ hg ci -Am1 |
|
278 | 274 | adding f2 |
|
279 | 275 | $ hg co -q 0 |
|
280 | 276 | $ hg branch b1 |
|
281 | 277 | marked working directory as branch b1 |
|
282 | 278 | (branches are permanent and global, did you want a bookmark?) |
|
283 | 279 | $ hg ci -m2 |
|
284 | 280 | $ hg up default |
|
285 | 281 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
286 | 282 | $ hg merge b1 |
|
287 | 283 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
288 | 284 | (branch merge, don't forget to commit) |
|
289 | 285 | |
|
290 | 286 | $ hg tag t1 |
|
291 | 287 | abort: uncommitted merge |
|
292 | 288 | [255] |
|
293 | 289 | $ hg status |
|
294 | 290 | $ hg tag --rev 1 t2 |
|
295 | 291 | abort: uncommitted merge |
|
296 | 292 | [255] |
|
297 | 293 | $ hg tag --rev 1 --local t3 |
|
298 | 294 | $ hg tags -v |
|
299 | 295 | tip 2:2a156e8887cc |
|
300 | 296 | t3 1:c3adabd1a5f4 local |
|
301 | 297 | |
|
302 | 298 | $ cd .. |
|
303 | 299 | |
|
304 | 300 | commit hook on tag used to be run without write lock - issue3344 |
|
305 | 301 | |
|
306 | 302 | $ hg init repo-tag |
|
307 | 303 | $ hg init repo-tag-target |
|
308 | $ hg -R repo-tag --config hooks.commit="hg push \"`pwd`/repo-tag-target\"" tag tag | |
|
304 | $ hg -R repo-tag --config hooks.commit="\"hg\" push \"`pwd`/repo-tag-target\"" tag tag | |
|
309 | 305 | pushing to $TESTTMP/repo-tag-target |
|
310 | 306 | searching for changes |
|
311 | 307 | adding changesets |
|
312 | 308 | adding manifests |
|
313 | 309 | adding file changes |
|
314 | 310 | added 1 changesets with 1 changes to 1 files |
|
315 | 311 |
General Comments 0
You need to be logged in to leave comments.
Login now