Mercurial > hg
comparison tests/test-mq-header-from.t @ 22546:aac5482db318
mq: refactor patchheader header ordering to match export (BC)
The refactoring also gives more robust and extendable handling of other HG
headers.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Wed, 24 Sep 2014 02:41:11 +0200 |
parents | 9d4ebb75de53 |
children | 6333412245ec |
comparison
equal
deleted
inserted
replaced
22545:6a2cfa61acb0 | 22546:aac5482db318 |
---|---|
268 1: [mq]: 2.patch - jane | 268 1: [mq]: 2.patch - jane |
269 0: [mq]: 1.patch - mary | 269 0: [mq]: 1.patch - mary |
270 ==== hg qref | 270 ==== hg qref |
271 adding 5 | 271 adding 5 |
272 # HG changeset patch | 272 # HG changeset patch |
273 # Parent | |
274 # User johndoe | 273 # User johndoe |
274 # Parent | |
275 | 275 |
276 diff -r ... 5 | 276 diff -r ... 5 |
277 --- /dev/null | 277 --- /dev/null |
278 +++ b/5 | 278 +++ b/5 |
279 @@ -0,0 +1,1 @@ | 279 @@ -0,0 +1,1 @@ |
283 2: Three (again) - maria | 283 2: Three (again) - maria |
284 1: [mq]: 2.patch - jane | 284 1: [mq]: 2.patch - jane |
285 0: [mq]: 1.patch - mary | 285 0: [mq]: 1.patch - mary |
286 ==== hg qref -U | 286 ==== hg qref -U |
287 # HG changeset patch | 287 # HG changeset patch |
288 # Parent | 288 # User test |
289 # User test | 289 # Parent |
290 | 290 |
291 diff -r ... 5 | 291 diff -r ... 5 |
292 --- /dev/null | 292 --- /dev/null |
293 +++ b/5 | 293 +++ b/5 |
294 @@ -0,0 +1,1 @@ | 294 @@ -0,0 +1,1 @@ |
298 2: Three (again) - maria | 298 2: Three (again) - maria |
299 1: [mq]: 2.patch - jane | 299 1: [mq]: 2.patch - jane |
300 0: [mq]: 1.patch - mary | 300 0: [mq]: 1.patch - mary |
301 ==== hg qref -u | 301 ==== hg qref -u |
302 # HG changeset patch | 302 # HG changeset patch |
303 # Parent | |
304 # User johndeere | 303 # User johndeere |
304 # Parent | |
305 | 305 |
306 diff -r ... 5 | 306 diff -r ... 5 |
307 --- /dev/null | 307 --- /dev/null |
308 +++ b/5 | 308 +++ b/5 |
309 @@ -0,0 +1,1 @@ | 309 @@ -0,0 +1,1 @@ |
558 1: [mq]: 2.patch - jane | 558 1: [mq]: 2.patch - jane |
559 0: [mq]: 1.patch - mary | 559 0: [mq]: 1.patch - mary |
560 ==== hg qref | 560 ==== hg qref |
561 adding 5 | 561 adding 5 |
562 # HG changeset patch | 562 # HG changeset patch |
563 # Parent | |
564 # User johndoe | 563 # User johndoe |
564 # Parent | |
565 | 565 |
566 diff -r ... 5 | 566 diff -r ... 5 |
567 --- /dev/null | 567 --- /dev/null |
568 +++ b/5 | 568 +++ b/5 |
569 @@ -0,0 +1,1 @@ | 569 @@ -0,0 +1,1 @@ |
573 2: Three (again) - maria | 573 2: Three (again) - maria |
574 1: [mq]: 2.patch - jane | 574 1: [mq]: 2.patch - jane |
575 0: [mq]: 1.patch - mary | 575 0: [mq]: 1.patch - mary |
576 ==== hg qref -U | 576 ==== hg qref -U |
577 # HG changeset patch | 577 # HG changeset patch |
578 # Parent | 578 # User test |
579 # User test | 579 # Parent |
580 | 580 |
581 diff -r ... 5 | 581 diff -r ... 5 |
582 --- /dev/null | 582 --- /dev/null |
583 +++ b/5 | 583 +++ b/5 |
584 @@ -0,0 +1,1 @@ | 584 @@ -0,0 +1,1 @@ |
588 2: Three (again) - maria | 588 2: Three (again) - maria |
589 1: [mq]: 2.patch - jane | 589 1: [mq]: 2.patch - jane |
590 0: [mq]: 1.patch - mary | 590 0: [mq]: 1.patch - mary |
591 ==== hg qref -u | 591 ==== hg qref -u |
592 # HG changeset patch | 592 # HG changeset patch |
593 # Parent | |
594 # User johndeere | 593 # User johndeere |
594 # Parent | |
595 | 595 |
596 diff -r ... 5 | 596 diff -r ... 5 |
597 --- /dev/null | 597 --- /dev/null |
598 +++ b/5 | 598 +++ b/5 |
599 @@ -0,0 +1,1 @@ | 599 @@ -0,0 +1,1 @@ |
843 1: [mq]: 2.patch - jane | 843 1: [mq]: 2.patch - jane |
844 0: [mq]: 1.patch - mary | 844 0: [mq]: 1.patch - mary |
845 ==== hg qref | 845 ==== hg qref |
846 adding 5 | 846 adding 5 |
847 # HG changeset patch | 847 # HG changeset patch |
848 # Parent | |
849 # User johndoe | 848 # User johndoe |
849 # Parent | |
850 | 850 |
851 diff -r ... 5 | 851 diff -r ... 5 |
852 --- /dev/null | 852 --- /dev/null |
853 +++ b/5 | 853 +++ b/5 |
854 @@ -0,0 +1,1 @@ | 854 @@ -0,0 +1,1 @@ |
858 2: Three (again) - maria | 858 2: Three (again) - maria |
859 1: [mq]: 2.patch - jane | 859 1: [mq]: 2.patch - jane |
860 0: [mq]: 1.patch - mary | 860 0: [mq]: 1.patch - mary |
861 ==== hg qref -U | 861 ==== hg qref -U |
862 # HG changeset patch | 862 # HG changeset patch |
863 # Parent | 863 # User test |
864 # User test | 864 # Parent |
865 | 865 |
866 diff -r ... 5 | 866 diff -r ... 5 |
867 --- /dev/null | 867 --- /dev/null |
868 +++ b/5 | 868 +++ b/5 |
869 @@ -0,0 +1,1 @@ | 869 @@ -0,0 +1,1 @@ |
873 2: Three (again) - maria | 873 2: Three (again) - maria |
874 1: [mq]: 2.patch - jane | 874 1: [mq]: 2.patch - jane |
875 0: [mq]: 1.patch - mary | 875 0: [mq]: 1.patch - mary |
876 ==== hg qref -u | 876 ==== hg qref -u |
877 # HG changeset patch | 877 # HG changeset patch |
878 # Parent | |
879 # User johndeere | 878 # User johndeere |
879 # Parent | |
880 | 880 |
881 diff -r ... 5 | 881 diff -r ... 5 |
882 --- /dev/null | 882 --- /dev/null |
883 +++ b/5 | 883 +++ b/5 |
884 @@ -0,0 +1,1 @@ | 884 @@ -0,0 +1,1 @@ |