Mercurial > hg

comparison tests/test-mq-header-date.t @ 35385:469b06b4c3ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add commit hashes to log commands in rebase tests Commit hashes are a useful way to ensure the content of commits made in the tests are not changing, even if we don't query every aspect of every commit. (And some properties, like extras, are rarely printed at all.) Many of the rebase log -G calls didn't show hashes; by adding hashes to places that weren't showing them we can help protect those tests from unwanted changes. Differential Revision: https://phab.mercurial-scm.org/D1650
author Phil Cohen <phillco@fb.com>
date Sun, 10 Dec 2017 21:57:37 -0800
parents a5c94ea3b8af
children 8d6109b49b31
comparison
equal deleted inserted replaced
35384:b9bdee046cc2 35385:469b06b4c3ca
9 > cat .hg/patches/$1.patch | sed -e "s/^diff \-r [0-9a-f]* /diff -r ... /" \ 9 > cat .hg/patches/$1.patch | sed -e "s/^diff \-r [0-9a-f]* /diff -r ... /" \
10 > -e "s/^\(# Parent \).*/\1/" 10 > -e "s/^\(# Parent \).*/\1/"
11 > } 11 > }
12 $ catlog() { 12 $ catlog() {
13 > catpatch $1 13 > catpatch $1
14 > hg log --template "{rev}: {desc} - {author}\n" 14 > hg log --template "{rev}: {node|short} {desc} - {author}\n"
15 > } 15 > }
16 $ catlogd() { 16 $ catlogd() {
17 > catpatch $1 17 > catpatch $1
18 > hg log --template "{rev}: {desc} - {author} - {date}\n" 18 > hg log --template "{rev}: {node|short} {desc} - {author} - {date}\n"
19 > } 19 > }
20 $ drop() { 20 $ drop() {
21 > hg qpop 21 > hg qpop
22 > hg qdel $1.patch 22 > hg qdel $1.patch
23 > } 23 > }
187 > 187 >
188 > 188 >
189 > echo ==== "qpop -a / qpush -a" 189 > echo ==== "qpop -a / qpush -a"
190 > hg qpop -a 190 > hg qpop -a
191 > hg qpush -a 191 > hg qpush -a
192 > hg log --template "{rev}: {desc} - {author} - {date}\n" 192 > hg log --template "{rev}: {node|short} {desc} - {author} - {date}\n"
193 > } 193 > }
194 194
195 ======= plain headers 195 ======= plain headers
196 196
197 $ echo "[mq]" >> $HGRCPATH 197 $ echo "[mq]" >> $HGRCPATH
200 $ (cd sandbox ; runtest) 200 $ (cd sandbox ; runtest)
201 ==== init 201 ==== init
202 ==== qnew -d 202 ==== qnew -d
203 Date: 3 0 203 Date: 3 0
204 204
205 0: [mq]: 1.patch - test - 3.00 205 0: 758bd2596a39 [mq]: 1.patch - test - 3.00
206 ==== qref 206 ==== qref
207 adding 1 207 adding 1
208 Date: 3 0 208 Date: 3 0
209 209
210 diff -r ... 1 210 diff -r ... 1
211 --- /dev/null 211 --- /dev/null
212 +++ b/1 212 +++ b/1
213 @@ -0,0 +1,1 @@ 213 @@ -0,0 +1,1 @@
214 +1 214 +1
215 0: [mq]: 1.patch - test - 3.00 215 0: 8c640e9949a8 [mq]: 1.patch - test - 3.00
216 ==== qref -d 216 ==== qref -d
217 Date: 4 0 217 Date: 4 0
218 218
219 diff -r ... 1 219 diff -r ... 1
220 --- /dev/null 220 --- /dev/null
221 +++ b/1 221 +++ b/1
222 @@ -0,0 +1,1 @@ 222 @@ -0,0 +1,1 @@
223 +1 223 +1
224 0: [mq]: 1.patch - test - 4.00 224 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
225 ==== qnew 225 ==== qnew
226 adding 2 226 adding 2
227 diff -r ... 2 227 diff -r ... 2
228 --- /dev/null 228 --- /dev/null
229 +++ b/2 229 +++ b/2
230 @@ -0,0 +1,1 @@ 230 @@ -0,0 +1,1 @@
231 +2 231 +2
232 1: [mq]: 2.patch - test 232 1: fc7e8a2f6499 [mq]: 2.patch - test
233 0: [mq]: 1.patch - test 233 0: 4a67dfeea974 [mq]: 1.patch - test
234 ==== qref -d 234 ==== qref -d
235 Date: 5 0 235 Date: 5 0
236 236
237 diff -r ... 2 237 diff -r ... 2
238 --- /dev/null 238 --- /dev/null
239 +++ b/2 239 +++ b/2
240 @@ -0,0 +1,1 @@ 240 @@ -0,0 +1,1 @@
241 +2 241 +2
242 1: [mq]: 2.patch - test 242 1: 1d9a6a118fd1 [mq]: 2.patch - test
243 0: [mq]: 1.patch - test 243 0: 4a67dfeea974 [mq]: 1.patch - test
244 popping 2.patch 244 popping 2.patch
245 now at: 1.patch 245 now at: 1.patch
246 ==== qnew -d -m 246 ==== qnew -d -m
247 Date: 6 0 247 Date: 6 0
248 248
249 Three 249 Three
250 250
251 1: Three - test - 6.00 251 1: 2a9ef0bdefba Three - test - 6.00
252 0: [mq]: 1.patch - test - 4.00 252 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
253 ==== qref 253 ==== qref
254 adding 3 254 adding 3
255 Date: 6 0 255 Date: 6 0
256 256
257 Three 257 Three
259 diff -r ... 3 259 diff -r ... 3
260 --- /dev/null 260 --- /dev/null
261 +++ b/3 261 +++ b/3
262 @@ -0,0 +1,1 @@ 262 @@ -0,0 +1,1 @@
263 +3 263 +3
264 1: Three - test - 6.00 264 1: 7f19ad9eea7b Three - test - 6.00
265 0: [mq]: 1.patch - test - 4.00 265 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
266 ==== qref -m 266 ==== qref -m
267 Date: 6 0 267 Date: 6 0
268 268
269 Drei 269 Drei
270 270
271 diff -r ... 3 271 diff -r ... 3
272 --- /dev/null 272 --- /dev/null
273 +++ b/3 273 +++ b/3
274 @@ -0,0 +1,1 @@ 274 @@ -0,0 +1,1 @@
275 +3 275 +3
276 1: Drei - test - 6.00 276 1: 7ff7377793e3 Drei - test - 6.00
277 0: [mq]: 1.patch - test - 4.00 277 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
278 ==== qref -d 278 ==== qref -d
279 Date: 7 0 279 Date: 7 0
280 280
281 Drei 281 Drei
282 282
283 diff -r ... 3 283 diff -r ... 3
284 --- /dev/null 284 --- /dev/null
285 +++ b/3 285 +++ b/3
286 @@ -0,0 +1,1 @@ 286 @@ -0,0 +1,1 @@
287 +3 287 +3
288 1: Drei - test - 7.00 288 1: d89d3144f518 Drei - test - 7.00
289 0: [mq]: 1.patch - test - 4.00 289 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
290 ==== qref -d -m 290 ==== qref -d -m
291 Date: 8 0 291 Date: 8 0
292 292
293 Three (again) 293 Three (again)
294 294
295 diff -r ... 3 295 diff -r ... 3
296 --- /dev/null 296 --- /dev/null
297 +++ b/3 297 +++ b/3
298 @@ -0,0 +1,1 @@ 298 @@ -0,0 +1,1 @@
299 +3 299 +3
300 1: Three (again) - test - 8.00 300 1: b1b6b0fe0e6d Three (again) - test - 8.00
301 0: [mq]: 1.patch - test - 4.00 301 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
302 ==== qnew -m 302 ==== qnew -m
303 adding 4 303 adding 4
304 Four 304 Four
305 305
306 diff -r ... 4 306 diff -r ... 4
307 --- /dev/null 307 --- /dev/null
308 +++ b/4 308 +++ b/4
309 @@ -0,0 +1,1 @@ 309 @@ -0,0 +1,1 @@
310 +4 310 +4
311 2: Four - test 311 2: 74ded07d166b Four - test
312 1: Three (again) - test 312 1: b1b6b0fe0e6d Three (again) - test
313 0: [mq]: 1.patch - test 313 0: 4a67dfeea974 [mq]: 1.patch - test
314 ==== qref -d 314 ==== qref -d
315 Date: 9 0 315 Date: 9 0
316 316
317 Four 317 Four
318 318
319 diff -r ... 4 319 diff -r ... 4
320 --- /dev/null 320 --- /dev/null
321 +++ b/4 321 +++ b/4
322 @@ -0,0 +1,1 @@ 322 @@ -0,0 +1,1 @@
323 +4 323 +4
324 2: Four - test 324 2: 1a651320cf8e Four - test
325 1: Three (again) - test 325 1: b1b6b0fe0e6d Three (again) - test
326 0: [mq]: 1.patch - test 326 0: 4a67dfeea974 [mq]: 1.patch - test
327 popping 4.patch 327 popping 4.patch
328 now at: 3.patch 328 now at: 3.patch
329 ==== qnew with HG header 329 ==== qnew with HG header
330 popping 5.patch 330 popping 5.patch
331 now at: 3.patch 331 now at: 3.patch
332 # HG changeset patch 332 # HG changeset patch
333 # Date 10 0 333 # Date 10 0
334 2: imported patch 5.patch - test - 10.00 334 2: d16a272220d2 imported patch 5.patch - test - 10.00
335 1: Three (again) - test - 8.00 335 1: b1b6b0fe0e6d Three (again) - test - 8.00
336 0: [mq]: 1.patch - test - 4.00 336 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
337 ==== hg qref 337 ==== hg qref
338 adding 5 338 adding 5
339 # HG changeset patch 339 # HG changeset patch
340 # Date 10 0 340 # Date 10 0
341 # Parent 341 # Parent
343 diff -r ... 5 343 diff -r ... 5
344 --- /dev/null 344 --- /dev/null
345 +++ b/5 345 +++ b/5
346 @@ -0,0 +1,1 @@ 346 @@ -0,0 +1,1 @@
347 +5 347 +5
348 2: [mq]: 5.patch - test - 10.00 348 2: 5dbf69c07df9 [mq]: 5.patch - test - 10.00
349 1: Three (again) - test - 8.00 349 1: b1b6b0fe0e6d Three (again) - test - 8.00
350 0: [mq]: 1.patch - test - 4.00 350 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
351 ==== hg qref -d 351 ==== hg qref -d
352 # HG changeset patch 352 # HG changeset patch
353 # Date 11 0 353 # Date 11 0
354 # Parent 354 # Parent
355 355
356 diff -r ... 5 356 diff -r ... 5
357 --- /dev/null 357 --- /dev/null
358 +++ b/5 358 +++ b/5
359 @@ -0,0 +1,1 @@ 359 @@ -0,0 +1,1 @@
360 +5 360 +5
361 2: [mq]: 5.patch - test - 11.00 361 2: 049de6af0c1d [mq]: 5.patch - test - 11.00
362 1: Three (again) - test - 8.00 362 1: b1b6b0fe0e6d Three (again) - test - 8.00
363 0: [mq]: 1.patch - test - 4.00 363 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
364 ==== qnew with plain header 364 ==== qnew with plain header
365 popping 6.patch 365 popping 6.patch
366 now at: 5.patch 366 now at: 5.patch
367 now at: 6.patch 367 now at: 6.patch
368 Date: 12 0 368 Date: 12 0
369 369
370 3: imported patch 6.patch - test 370 3: 8ad9ebc22b96 imported patch 6.patch - test
371 2: [mq]: 5.patch - test 371 2: 049de6af0c1d [mq]: 5.patch - test
372 1: Three (again) - test 372 1: b1b6b0fe0e6d Three (again) - test
373 0: [mq]: 1.patch - test 373 0: 4a67dfeea974 [mq]: 1.patch - test
374 ==== hg qref 374 ==== hg qref
375 adding 6 375 adding 6
376 Date: 12 0 376 Date: 12 0
377 377
378 diff -r ... 6 378 diff -r ... 6
379 --- /dev/null 379 --- /dev/null
380 +++ b/6 380 +++ b/6
381 @@ -0,0 +1,1 @@ 381 @@ -0,0 +1,1 @@
382 +6 382 +6
383 3: [mq]: 6.patch - test - 12.00 383 3: 038c46b02a56 [mq]: 6.patch - test - 12.00
384 2: [mq]: 5.patch - test - 11.00 384 2: 049de6af0c1d [mq]: 5.patch - test - 11.00
385 1: Three (again) - test - 8.00 385 1: b1b6b0fe0e6d Three (again) - test - 8.00
386 0: [mq]: 1.patch - test - 4.00 386 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
387 ==== hg qref -d 387 ==== hg qref -d
388 Date: 13 0 388 Date: 13 0
389 389
390 diff -r ... 6 390 diff -r ... 6
391 --- /dev/null 391 --- /dev/null
392 +++ b/6 392 +++ b/6
393 @@ -0,0 +1,1 @@ 393 @@ -0,0 +1,1 @@
394 +6 394 +6
395 3: [mq]: 6.patch - test - 13.00 395 3: 2785642ea4b4 [mq]: 6.patch - test - 13.00
396 2: [mq]: 5.patch - test - 11.00 396 2: 049de6af0c1d [mq]: 5.patch - test - 11.00
397 1: Three (again) - test - 8.00 397 1: b1b6b0fe0e6d Three (again) - test - 8.00
398 0: [mq]: 1.patch - test - 4.00 398 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
399 popping 6.patch 399 popping 6.patch
400 now at: 5.patch 400 now at: 5.patch
401 ==== qnew -u 401 ==== qnew -u
402 adding 6 402 adding 6
403 From: jane 403 From: jane
405 diff -r ... 6 405 diff -r ... 6
406 --- /dev/null 406 --- /dev/null
407 +++ b/6 407 +++ b/6
408 @@ -0,0 +1,1 @@ 408 @@ -0,0 +1,1 @@
409 +6 409 +6
410 3: [mq]: 6.patch - jane 410 3: a05a33f187ce [mq]: 6.patch - jane
411 2: [mq]: 5.patch - test 411 2: 049de6af0c1d [mq]: 5.patch - test
412 1: Three (again) - test 412 1: b1b6b0fe0e6d Three (again) - test
413 0: [mq]: 1.patch - test 413 0: 4a67dfeea974 [mq]: 1.patch - test
414 ==== qref -d 414 ==== qref -d
415 From: jane 415 From: jane
416 Date: 12 0 416 Date: 12 0
417 417
418 diff -r ... 6 418 diff -r ... 6
419 --- /dev/null 419 --- /dev/null
420 +++ b/6 420 +++ b/6
421 @@ -0,0 +1,1 @@ 421 @@ -0,0 +1,1 @@
422 +6 422 +6
423 3: [mq]: 6.patch - jane 423 3: 5702c529dfe9 [mq]: 6.patch - jane
424 2: [mq]: 5.patch - test 424 2: 049de6af0c1d [mq]: 5.patch - test
425 1: Three (again) - test 425 1: b1b6b0fe0e6d Three (again) - test
426 0: [mq]: 1.patch - test 426 0: 4a67dfeea974 [mq]: 1.patch - test
427 popping 6.patch 427 popping 6.patch
428 now at: 5.patch 428 now at: 5.patch
429 ==== qnew -d 429 ==== qnew -d
430 adding 7 430 adding 7
431 Date: 13 0 431 Date: 13 0
433 diff -r ... 7 433 diff -r ... 7
434 --- /dev/null 434 --- /dev/null
435 +++ b/7 435 +++ b/7
436 @@ -0,0 +1,1 @@ 436 @@ -0,0 +1,1 @@
437 +7 437 +7
438 3: [mq]: 7.patch - test 438 3: 8dd1eb8d4132 [mq]: 7.patch - test
439 2: [mq]: 5.patch - test 439 2: 049de6af0c1d [mq]: 5.patch - test
440 1: Three (again) - test 440 1: b1b6b0fe0e6d Three (again) - test
441 0: [mq]: 1.patch - test 441 0: 4a67dfeea974 [mq]: 1.patch - test
442 ==== qref -u 442 ==== qref -u
443 From: john 443 From: john
444 Date: 13 0 444 Date: 13 0
445 445
446 diff -r ... 7 446 diff -r ... 7
447 --- /dev/null 447 --- /dev/null
448 +++ b/7 448 +++ b/7
449 @@ -0,0 +1,1 @@ 449 @@ -0,0 +1,1 @@
450 +7 450 +7
451 3: [mq]: 7.patch - john - 13.00 451 3: 4f9d07369cc4 [mq]: 7.patch - john - 13.00
452 2: [mq]: 5.patch - test - 11.00 452 2: 049de6af0c1d [mq]: 5.patch - test - 11.00
453 1: Three (again) - test - 8.00 453 1: b1b6b0fe0e6d Three (again) - test - 8.00
454 0: [mq]: 1.patch - test - 4.00 454 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
455 ==== qnew 455 ==== qnew
456 adding 8 456 adding 8
457 diff -r ... 8 457 diff -r ... 8
458 --- /dev/null 458 --- /dev/null
459 +++ b/8 459 +++ b/8
460 @@ -0,0 +1,1 @@ 460 @@ -0,0 +1,1 @@
461 +8 461 +8
462 4: [mq]: 8.patch - test 462 4: 868b62f09492 [mq]: 8.patch - test
463 3: [mq]: 7.patch - john 463 3: 4f9d07369cc4 [mq]: 7.patch - john
464 2: [mq]: 5.patch - test 464 2: 049de6af0c1d [mq]: 5.patch - test
465 1: Three (again) - test 465 1: b1b6b0fe0e6d Three (again) - test
466 0: [mq]: 1.patch - test 466 0: 4a67dfeea974 [mq]: 1.patch - test
467 ==== qref -u -d 467 ==== qref -u -d
468 From: john 468 From: john
469 Date: 14 0 469 Date: 14 0
470 470
471 diff -r ... 8 471 diff -r ... 8
472 --- /dev/null 472 --- /dev/null
473 +++ b/8 473 +++ b/8
474 @@ -0,0 +1,1 @@ 474 @@ -0,0 +1,1 @@
475 +8 475 +8
476 4: [mq]: 8.patch - john 476 4: b1e878ae55b9 [mq]: 8.patch - john
477 3: [mq]: 7.patch - john 477 3: 4f9d07369cc4 [mq]: 7.patch - john
478 2: [mq]: 5.patch - test 478 2: 049de6af0c1d [mq]: 5.patch - test
479 1: Three (again) - test 479 1: b1b6b0fe0e6d Three (again) - test
480 0: [mq]: 1.patch - test 480 0: 4a67dfeea974 [mq]: 1.patch - test
481 popping 8.patch 481 popping 8.patch
482 now at: 7.patch 482 now at: 7.patch
483 ==== qnew -m 483 ==== qnew -m
484 adding 9 484 adding 9
485 Nine 485 Nine
487 diff -r ... 9 487 diff -r ... 9
488 --- /dev/null 488 --- /dev/null
489 +++ b/9 489 +++ b/9
490 @@ -0,0 +1,1 @@ 490 @@ -0,0 +1,1 @@
491 +9 491 +9
492 4: Nine - test 492 4: 7251936ac2bf Nine - test
493 3: [mq]: 7.patch - john 493 3: 4f9d07369cc4 [mq]: 7.patch - john
494 2: [mq]: 5.patch - test 494 2: 049de6af0c1d [mq]: 5.patch - test
495 1: Three (again) - test 495 1: b1b6b0fe0e6d Three (again) - test
496 0: [mq]: 1.patch - test 496 0: 4a67dfeea974 [mq]: 1.patch - test
497 ==== qref -u -d 497 ==== qref -u -d
498 From: john 498 From: john
499 Date: 15 0 499 Date: 15 0
500 500
501 Nine 501 Nine
503 diff -r ... 9 503 diff -r ... 9
504 --- /dev/null 504 --- /dev/null
505 +++ b/9 505 +++ b/9
506 @@ -0,0 +1,1 @@ 506 @@ -0,0 +1,1 @@
507 +9 507 +9
508 4: Nine - john 508 4: a0de5bf6e9f7 Nine - john
509 3: [mq]: 7.patch - john 509 3: 4f9d07369cc4 [mq]: 7.patch - john
510 2: [mq]: 5.patch - test 510 2: 049de6af0c1d [mq]: 5.patch - test
511 1: Three (again) - test 511 1: b1b6b0fe0e6d Three (again) - test
512 0: [mq]: 1.patch - test 512 0: 4a67dfeea974 [mq]: 1.patch - test
513 popping 9.patch 513 popping 9.patch
514 now at: 7.patch 514 now at: 7.patch
515 ==== qpop -a / qpush -a 515 ==== qpop -a / qpush -a
516 popping 7.patch 516 popping 7.patch
517 popping 5.patch 517 popping 5.patch
521 applying 1.patch 521 applying 1.patch
522 applying 3.patch 522 applying 3.patch
523 applying 5.patch 523 applying 5.patch
524 applying 7.patch 524 applying 7.patch
525 now at: 7.patch 525 now at: 7.patch
526 3: imported patch 7.patch - john - 13.00 526 3: d26a5b7ffce1 imported patch 7.patch - john - 13.00
527 2: imported patch 5.patch - test - 11.00 527 2: dda6cf77060a imported patch 5.patch - test - 11.00
528 1: Three (again) - test - 8.00 528 1: 25e32d66c8c7 Three (again) - test - 8.00
529 0: imported patch 1.patch - test - 4.00 529 0: e5011c0211fe imported patch 1.patch - test - 4.00
530 $ rm -r sandbox 530 $ rm -r sandbox
531 531
532 ======= hg headers 532 ======= hg headers
533 533
534 $ echo "plain=false" >> $HGRCPATH 534 $ echo "plain=false" >> $HGRCPATH
538 ==== qnew -d 538 ==== qnew -d
539 # HG changeset patch 539 # HG changeset patch
540 # Date 3 0 540 # Date 3 0
541 # Parent 541 # Parent
542 542
543 0: [mq]: 1.patch - test - 3.00 543 0: 758bd2596a39 [mq]: 1.patch - test - 3.00
544 ==== qref 544 ==== qref
545 adding 1 545 adding 1
546 # HG changeset patch 546 # HG changeset patch
547 # Date 3 0 547 # Date 3 0
548 # Parent 548 # Parent
550 diff -r ... 1 550 diff -r ... 1
551 --- /dev/null 551 --- /dev/null
552 +++ b/1 552 +++ b/1
553 @@ -0,0 +1,1 @@ 553 @@ -0,0 +1,1 @@
554 +1 554 +1
555 0: [mq]: 1.patch - test - 3.00 555 0: 8c640e9949a8 [mq]: 1.patch - test - 3.00
556 ==== qref -d 556 ==== qref -d
557 # HG changeset patch 557 # HG changeset patch
558 # Date 4 0 558 # Date 4 0
559 # Parent 559 # Parent
560 560
561 diff -r ... 1 561 diff -r ... 1
562 --- /dev/null 562 --- /dev/null
563 +++ b/1 563 +++ b/1
564 @@ -0,0 +1,1 @@ 564 @@ -0,0 +1,1 @@
565 +1 565 +1
566 0: [mq]: 1.patch - test - 4.00 566 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
567 ==== qnew 567 ==== qnew
568 adding 2 568 adding 2
569 # HG changeset patch 569 # HG changeset patch
570 # Parent 570 # Parent
571 571
572 diff -r ... 2 572 diff -r ... 2
573 --- /dev/null 573 --- /dev/null
574 +++ b/2 574 +++ b/2
575 @@ -0,0 +1,1 @@ 575 @@ -0,0 +1,1 @@
576 +2 576 +2
577 1: [mq]: 2.patch - test 577 1: fc7e8a2f6499 [mq]: 2.patch - test
578 0: [mq]: 1.patch - test 578 0: 4a67dfeea974 [mq]: 1.patch - test
579 ==== qref -d 579 ==== qref -d
580 # HG changeset patch 580 # HG changeset patch
581 # Date 5 0 581 # Date 5 0
582 # Parent 582 # Parent
583 583
584 diff -r ... 2 584 diff -r ... 2
585 --- /dev/null 585 --- /dev/null
586 +++ b/2 586 +++ b/2
587 @@ -0,0 +1,1 @@ 587 @@ -0,0 +1,1 @@
588 +2 588 +2
589 1: [mq]: 2.patch - test 589 1: 1d9a6a118fd1 [mq]: 2.patch - test
590 0: [mq]: 1.patch - test 590 0: 4a67dfeea974 [mq]: 1.patch - test
591 popping 2.patch 591 popping 2.patch
592 now at: 1.patch 592 now at: 1.patch
593 ==== qnew -d -m 593 ==== qnew -d -m
594 # HG changeset patch 594 # HG changeset patch
595 # Date 6 0 595 # Date 6 0
596 # Parent 596 # Parent
597 Three 597 Three
598 598
599 1: Three - test - 6.00 599 1: 2a9ef0bdefba Three - test - 6.00
600 0: [mq]: 1.patch - test - 4.00 600 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
601 ==== qref 601 ==== qref
602 adding 3 602 adding 3
603 # HG changeset patch 603 # HG changeset patch
604 # Date 6 0 604 # Date 6 0
605 # Parent 605 # Parent
608 diff -r ... 3 608 diff -r ... 3
609 --- /dev/null 609 --- /dev/null
610 +++ b/3 610 +++ b/3
611 @@ -0,0 +1,1 @@ 611 @@ -0,0 +1,1 @@
612 +3 612 +3
613 1: Three - test - 6.00 613 1: 7f19ad9eea7b Three - test - 6.00
614 0: [mq]: 1.patch - test - 4.00 614 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
615 ==== qref -m 615 ==== qref -m
616 # HG changeset patch 616 # HG changeset patch
617 # Date 6 0 617 # Date 6 0
618 # Parent 618 # Parent
619 Drei 619 Drei
621 diff -r ... 3 621 diff -r ... 3
622 --- /dev/null 622 --- /dev/null
623 +++ b/3 623 +++ b/3
624 @@ -0,0 +1,1 @@ 624 @@ -0,0 +1,1 @@
625 +3 625 +3
626 1: Drei - test - 6.00 626 1: 7ff7377793e3 Drei - test - 6.00
627 0: [mq]: 1.patch - test - 4.00 627 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
628 ==== qref -d 628 ==== qref -d
629 # HG changeset patch 629 # HG changeset patch
630 # Date 7 0 630 # Date 7 0
631 # Parent 631 # Parent
632 Drei 632 Drei
634 diff -r ... 3 634 diff -r ... 3
635 --- /dev/null 635 --- /dev/null
636 +++ b/3 636 +++ b/3
637 @@ -0,0 +1,1 @@ 637 @@ -0,0 +1,1 @@
638 +3 638 +3
639 1: Drei - test - 7.00 639 1: d89d3144f518 Drei - test - 7.00
640 0: [mq]: 1.patch - test - 4.00 640 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
641 ==== qref -d -m 641 ==== qref -d -m
642 # HG changeset patch 642 # HG changeset patch
643 # Date 8 0 643 # Date 8 0
644 # Parent 644 # Parent
645 Three (again) 645 Three (again)
647 diff -r ... 3 647 diff -r ... 3
648 --- /dev/null 648 --- /dev/null
649 +++ b/3 649 +++ b/3
650 @@ -0,0 +1,1 @@ 650 @@ -0,0 +1,1 @@
651 +3 651 +3
652 1: Three (again) - test - 8.00 652 1: b1b6b0fe0e6d Three (again) - test - 8.00
653 0: [mq]: 1.patch - test - 4.00 653 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
654 ==== qnew -m 654 ==== qnew -m
655 adding 4 655 adding 4
656 # HG changeset patch 656 # HG changeset patch
657 # Parent 657 # Parent
658 Four 658 Four
660 diff -r ... 4 660 diff -r ... 4
661 --- /dev/null 661 --- /dev/null
662 +++ b/4 662 +++ b/4
663 @@ -0,0 +1,1 @@ 663 @@ -0,0 +1,1 @@
664 +4 664 +4
665 2: Four - test 665 2: 74ded07d166b Four - test
666 1: Three (again) - test 666 1: b1b6b0fe0e6d Three (again) - test
667 0: [mq]: 1.patch - test 667 0: 4a67dfeea974 [mq]: 1.patch - test
668 ==== qref -d 668 ==== qref -d
669 # HG changeset patch 669 # HG changeset patch
670 # Date 9 0 670 # Date 9 0
671 # Parent 671 # Parent
672 Four 672 Four
674 diff -r ... 4 674 diff -r ... 4
675 --- /dev/null 675 --- /dev/null
676 +++ b/4 676 +++ b/4
677 @@ -0,0 +1,1 @@ 677 @@ -0,0 +1,1 @@
678 +4 678 +4
679 2: Four - test 679 2: 1a651320cf8e Four - test
680 1: Three (again) - test 680 1: b1b6b0fe0e6d Three (again) - test
681 0: [mq]: 1.patch - test 681 0: 4a67dfeea974 [mq]: 1.patch - test
682 popping 4.patch 682 popping 4.patch
683 now at: 3.patch 683 now at: 3.patch
684 ==== qnew with HG header 684 ==== qnew with HG header
685 popping 5.patch 685 popping 5.patch
686 now at: 3.patch 686 now at: 3.patch
687 # HG changeset patch 687 # HG changeset patch
688 # Date 10 0 688 # Date 10 0
689 2: imported patch 5.patch - test - 10.00 689 2: d16a272220d2 imported patch 5.patch - test - 10.00
690 1: Three (again) - test - 8.00 690 1: b1b6b0fe0e6d Three (again) - test - 8.00
691 0: [mq]: 1.patch - test - 4.00 691 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
692 ==== hg qref 692 ==== hg qref
693 adding 5 693 adding 5
694 # HG changeset patch 694 # HG changeset patch
695 # Date 10 0 695 # Date 10 0
696 # Parent 696 # Parent
698 diff -r ... 5 698 diff -r ... 5
699 --- /dev/null 699 --- /dev/null
700 +++ b/5 700 +++ b/5
701 @@ -0,0 +1,1 @@ 701 @@ -0,0 +1,1 @@
702 +5 702 +5
703 2: [mq]: 5.patch - test - 10.00 703 2: 5dbf69c07df9 [mq]: 5.patch - test - 10.00
704 1: Three (again) - test - 8.00 704 1: b1b6b0fe0e6d Three (again) - test - 8.00
705 0: [mq]: 1.patch - test - 4.00 705 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
706 ==== hg qref -d 706 ==== hg qref -d
707 # HG changeset patch 707 # HG changeset patch
708 # Date 11 0 708 # Date 11 0
709 # Parent 709 # Parent
710 710
711 diff -r ... 5 711 diff -r ... 5
712 --- /dev/null 712 --- /dev/null
713 +++ b/5 713 +++ b/5
714 @@ -0,0 +1,1 @@ 714 @@ -0,0 +1,1 @@
715 +5 715 +5
716 2: [mq]: 5.patch - test - 11.00 716 2: 049de6af0c1d [mq]: 5.patch - test - 11.00
717 1: Three (again) - test - 8.00 717 1: b1b6b0fe0e6d Three (again) - test - 8.00
718 0: [mq]: 1.patch - test - 4.00 718 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
719 ==== qnew with plain header 719 ==== qnew with plain header
720 popping 6.patch 720 popping 6.patch
721 now at: 5.patch 721 now at: 5.patch
722 now at: 6.patch 722 now at: 6.patch
723 Date: 12 0 723 Date: 12 0
724 724
725 3: imported patch 6.patch - test 725 3: 8ad9ebc22b96 imported patch 6.patch - test
726 2: [mq]: 5.patch - test 726 2: 049de6af0c1d [mq]: 5.patch - test
727 1: Three (again) - test 727 1: b1b6b0fe0e6d Three (again) - test
728 0: [mq]: 1.patch - test 728 0: 4a67dfeea974 [mq]: 1.patch - test
729 ==== hg qref 729 ==== hg qref
730 adding 6 730 adding 6
731 Date: 12 0 731 Date: 12 0
732 732
733 diff -r ... 6 733 diff -r ... 6
734 --- /dev/null 734 --- /dev/null
735 +++ b/6 735 +++ b/6
736 @@ -0,0 +1,1 @@ 736 @@ -0,0 +1,1 @@
737 +6 737 +6
738 3: [mq]: 6.patch - test - 12.00 738 3: 038c46b02a56 [mq]: 6.patch - test - 12.00
739 2: [mq]: 5.patch - test - 11.00 739 2: 049de6af0c1d [mq]: 5.patch - test - 11.00
740 1: Three (again) - test - 8.00 740 1: b1b6b0fe0e6d Three (again) - test - 8.00
741 0: [mq]: 1.patch - test - 4.00 741 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
742 ==== hg qref -d 742 ==== hg qref -d
743 Date: 13 0 743 Date: 13 0
744 744
745 diff -r ... 6 745 diff -r ... 6
746 --- /dev/null 746 --- /dev/null
747 +++ b/6 747 +++ b/6
748 @@ -0,0 +1,1 @@ 748 @@ -0,0 +1,1 @@
749 +6 749 +6
750 3: [mq]: 6.patch - test - 13.00 750 3: 2785642ea4b4 [mq]: 6.patch - test - 13.00
751 2: [mq]: 5.patch - test - 11.00 751 2: 049de6af0c1d [mq]: 5.patch - test - 11.00
752 1: Three (again) - test - 8.00 752 1: b1b6b0fe0e6d Three (again) - test - 8.00
753 0: [mq]: 1.patch - test - 4.00 753 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
754 popping 6.patch 754 popping 6.patch
755 now at: 5.patch 755 now at: 5.patch
756 ==== qnew -u 756 ==== qnew -u
757 adding 6 757 adding 6
758 # HG changeset patch 758 # HG changeset patch
762 diff -r ... 6 762 diff -r ... 6
763 --- /dev/null 763 --- /dev/null
764 +++ b/6 764 +++ b/6
765 @@ -0,0 +1,1 @@ 765 @@ -0,0 +1,1 @@
766 +6 766 +6
767 3: [mq]: 6.patch - jane 767 3: a05a33f187ce [mq]: 6.patch - jane
768 2: [mq]: 5.patch - test 768 2: 049de6af0c1d [mq]: 5.patch - test
769 1: Three (again) - test 769 1: b1b6b0fe0e6d Three (again) - test
770 0: [mq]: 1.patch - test 770 0: 4a67dfeea974 [mq]: 1.patch - test
771 ==== qref -d 771 ==== qref -d
772 # HG changeset patch 772 # HG changeset patch
773 # User jane 773 # User jane
774 # Date 12 0 774 # Date 12 0
775 # Parent 775 # Parent
777 diff -r ... 6 777 diff -r ... 6
778 --- /dev/null 778 --- /dev/null
779 +++ b/6 779 +++ b/6
780 @@ -0,0 +1,1 @@ 780 @@ -0,0 +1,1 @@
781 +6 781 +6
782 3: [mq]: 6.patch - jane 782 3: 5702c529dfe9 [mq]: 6.patch - jane
783 2: [mq]: 5.patch - test 783 2: 049de6af0c1d [mq]: 5.patch - test
784 1: Three (again) - test 784 1: b1b6b0fe0e6d Three (again) - test
785 0: [mq]: 1.patch - test 785 0: 4a67dfeea974 [mq]: 1.patch - test
786 popping 6.patch 786 popping 6.patch
787 now at: 5.patch 787 now at: 5.patch
788 ==== qnew -d 788 ==== qnew -d
789 adding 7 789 adding 7
790 # HG changeset patch 790 # HG changeset patch
794 diff -r ... 7 794 diff -r ... 7
795 --- /dev/null 795 --- /dev/null
796 +++ b/7 796 +++ b/7
797 @@ -0,0 +1,1 @@ 797 @@ -0,0 +1,1 @@
798 +7 798 +7
799 3: [mq]: 7.patch - test 799 3: 8dd1eb8d4132 [mq]: 7.patch - test
800 2: [mq]: 5.patch - test 800 2: 049de6af0c1d [mq]: 5.patch - test
801 1: Three (again) - test 801 1: b1b6b0fe0e6d Three (again) - test
802 0: [mq]: 1.patch - test 802 0: 4a67dfeea974 [mq]: 1.patch - test
803 ==== qref -u 803 ==== qref -u
804 # HG changeset patch 804 # HG changeset patch
805 # User john 805 # User john
806 # Date 13 0 806 # Date 13 0
807 # Parent 807 # Parent
809 diff -r ... 7 809 diff -r ... 7
810 --- /dev/null 810 --- /dev/null
811 +++ b/7 811 +++ b/7
812 @@ -0,0 +1,1 @@ 812 @@ -0,0 +1,1 @@
813 +7 813 +7
814 3: [mq]: 7.patch - john - 13.00 814 3: 4f9d07369cc4 [mq]: 7.patch - john - 13.00
815 2: [mq]: 5.patch - test - 11.00 815 2: 049de6af0c1d [mq]: 5.patch - test - 11.00
816 1: Three (again) - test - 8.00 816 1: b1b6b0fe0e6d Three (again) - test - 8.00
817 0: [mq]: 1.patch - test - 4.00 817 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
818 ==== qnew 818 ==== qnew
819 adding 8 819 adding 8
820 # HG changeset patch 820 # HG changeset patch
821 # Parent 821 # Parent
822 822
823 diff -r ... 8 823 diff -r ... 8
824 --- /dev/null 824 --- /dev/null
825 +++ b/8 825 +++ b/8
826 @@ -0,0 +1,1 @@ 826 @@ -0,0 +1,1 @@
827 +8 827 +8
828 4: [mq]: 8.patch - test 828 4: 868b62f09492 [mq]: 8.patch - test
829 3: [mq]: 7.patch - john 829 3: 4f9d07369cc4 [mq]: 7.patch - john
830 2: [mq]: 5.patch - test 830 2: 049de6af0c1d [mq]: 5.patch - test
831 1: Three (again) - test 831 1: b1b6b0fe0e6d Three (again) - test
832 0: [mq]: 1.patch - test 832 0: 4a67dfeea974 [mq]: 1.patch - test
833 ==== qref -u -d 833 ==== qref -u -d
834 # HG changeset patch 834 # HG changeset patch
835 # User john 835 # User john
836 # Date 14 0 836 # Date 14 0
837 # Parent 837 # Parent
839 diff -r ... 8 839 diff -r ... 8
840 --- /dev/null 840 --- /dev/null
841 +++ b/8 841 +++ b/8
842 @@ -0,0 +1,1 @@ 842 @@ -0,0 +1,1 @@
843 +8 843 +8
844 4: [mq]: 8.patch - john 844 4: b1e878ae55b9 [mq]: 8.patch - john
845 3: [mq]: 7.patch - john 845 3: 4f9d07369cc4 [mq]: 7.patch - john
846 2: [mq]: 5.patch - test 846 2: 049de6af0c1d [mq]: 5.patch - test
847 1: Three (again) - test 847 1: b1b6b0fe0e6d Three (again) - test
848 0: [mq]: 1.patch - test 848 0: 4a67dfeea974 [mq]: 1.patch - test
849 popping 8.patch 849 popping 8.patch
850 now at: 7.patch 850 now at: 7.patch
851 ==== qnew -m 851 ==== qnew -m
852 adding 9 852 adding 9
853 # HG changeset patch 853 # HG changeset patch
857 diff -r ... 9 857 diff -r ... 9
858 --- /dev/null 858 --- /dev/null
859 +++ b/9 859 +++ b/9
860 @@ -0,0 +1,1 @@ 860 @@ -0,0 +1,1 @@
861 +9 861 +9
862 4: Nine - test 862 4: 7251936ac2bf Nine - test
863 3: [mq]: 7.patch - john 863 3: 4f9d07369cc4 [mq]: 7.patch - john
864 2: [mq]: 5.patch - test 864 2: 049de6af0c1d [mq]: 5.patch - test
865 1: Three (again) - test 865 1: b1b6b0fe0e6d Three (again) - test
866 0: [mq]: 1.patch - test 866 0: 4a67dfeea974 [mq]: 1.patch - test
867 ==== qref -u -d 867 ==== qref -u -d
868 # HG changeset patch 868 # HG changeset patch
869 # User john 869 # User john
870 # Date 15 0 870 # Date 15 0
871 # Parent 871 # Parent
874 diff -r ... 9 874 diff -r ... 9
875 --- /dev/null 875 --- /dev/null
876 +++ b/9 876 +++ b/9
877 @@ -0,0 +1,1 @@ 877 @@ -0,0 +1,1 @@
878 +9 878 +9
879 4: Nine - john 879 4: a0de5bf6e9f7 Nine - john
880 3: [mq]: 7.patch - john 880 3: 4f9d07369cc4 [mq]: 7.patch - john
881 2: [mq]: 5.patch - test 881 2: 049de6af0c1d [mq]: 5.patch - test
882 1: Three (again) - test 882 1: b1b6b0fe0e6d Three (again) - test
883 0: [mq]: 1.patch - test 883 0: 4a67dfeea974 [mq]: 1.patch - test
884 popping 9.patch 884 popping 9.patch
885 now at: 7.patch 885 now at: 7.patch
886 ==== qpop -a / qpush -a 886 ==== qpop -a / qpush -a
887 popping 7.patch 887 popping 7.patch
888 popping 5.patch 888 popping 5.patch
892 applying 1.patch 892 applying 1.patch
893 applying 3.patch 893 applying 3.patch
894 applying 5.patch 894 applying 5.patch
895 applying 7.patch 895 applying 7.patch
896 now at: 7.patch 896 now at: 7.patch
897 3: imported patch 7.patch - john - 13.00 897 3: d26a5b7ffce1 imported patch 7.patch - john - 13.00
898 2: imported patch 5.patch - test - 11.00 898 2: dda6cf77060a imported patch 5.patch - test - 11.00
899 1: Three (again) - test - 8.00 899 1: 25e32d66c8c7 Three (again) - test - 8.00
900 0: imported patch 1.patch - test - 4.00 900 0: e5011c0211fe imported patch 1.patch - test - 4.00
901 $ rm -r sandbox 901 $ rm -r sandbox