summaryrefslogtreecommitdiffstats
path: root/runtime/poky/qemux86-64/core-image-ptest-quilt/ptest-quilt.log
blob: 335fb3f3a5d13277d71a6dc17d84fab2abd6210d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
START: ptest-runner
2024-04-17T03:56
[test/add-filename-check.test]
[1] $ mkdir patches -- ok
[3] $ quilt new test.diff -- ok
[6] $ echo foo > foo -- ok
[7] $ quilt add foo -- ok
[10] $ quilt add patches/bar -- ok
[13] $ quilt add .pc/baz -- ok
6 commands (6 passed, 0 failed)
PASS: add-filename-check
[test/altered-series.test]
[3] $ mkdir patches -- ok
[4] $ cat > patches/series -- ok
[9] $ quilt push -q 2 -- ok
[16] $ quilt series -v -- ok
[22] $ touch patches/series -- ok
[24] $ quilt series -v -- ok
[30] $ cat > patches/series -- ok
[35] $ quilt series -v -- ok
[38] $ quilt pop -- ok
[44] $ quilt series -v -- ok
[47] $ quilt pop -a -- ok
[52] $ quilt series -v -- ok
12 commands (12 passed, 0 failed)
PASS: altered-series
[test/annotate.test]
[1] $ mkdir patches -- ok
[3] $ cat > foo -- ok
[8] $ quilt new patch -- ok
[11] $ quilt add foo -- ok
[14] $ sed -e 's:b:B:' foo > foo.new -- ok
[15] $ mv foo.new foo -- ok
[16] $ quilt refresh -- ok
[19] $ quilt annotate foo -- ok
[26] $ quilt new patch2 -- ok
[29] $ quilt add foo -- ok
[32] $ sed -e 's:Baz:baz:' foo > foo.new -- ok
[33] $ mv foo.new foo -- ok
[34] $ quilt refresh -- ok
[37] $ quilt annotate foo -- ok
[45] $ quilt new patch3 -- ok
[48] $ quilt add foo -- ok
[51] $ sed -e '/Bar/d' foo > foo.new -- ok
[52] $ mv foo.new foo -- ok
[53] $ quilt refresh -- ok
[56] $ quilt annotate foo -- ok
[64] $ quilt annotate -P patch3 foo -- ok
[72] $ quilt annotate -P patch2 foo -- ok
[80] $ quilt annotate -P patch foo -- ok
[87] $ quilt new patch4 -- ok
[90] $ cat > jkl -- ok
[94] $ quilt add jkl wrz -- ok
[98] $ rm -f jkl -- ok
[99] $ cat > wrz -- ok
[103] $ quilt refresh -- ok
[106] $ quilt annotate jkl -- ok
[110] $ quilt annotate wrz -- ok
31 commands (31 passed, 0 failed)
PASS: annotate
[test/applied.test]
[1] $ mkdir patches -- ok
[3] $ echo a > a -- ok
[4] $ echo b > b -- ok
[5] $ diff -u a b > patches/patch -- ok
[6] $ echo patch -p0 > patches/series -- ok
[7] $ rm -f b -- ok
[8] $ quilt push -q -- ok
[12] $ quilt pop -q -- ok
[16] $ patch -s -p0 < patches/patch -- ok
[17] $ quilt push -q -- ok
[22] $ echo patch -p0 -R > patches/series -- ok
[23] $ quilt push -q -- ok
[27] $ quilt pop -q -- ok
[31] $ patch -s -p0 -R < patches/patch -- ok
[32] $ quilt push -q -- ok
15 commands (15 passed, 0 failed)
PASS: applied
[test/auto-refresh.test]
[1] $ mkdir patches -- ok
[3] $ echo a > a -- ok
[4] $ echo b > b -- ok
[6] $ quilt new a.patch -- ok
[8] $ quilt add a -- ok
[10] $ echo A > a -- ok
[12] $ quilt new b.patch -- ok
[14] $ quilt add b -- ok
[16] $ echo B > b -- ok
[18] $ quilt pop -fa --refresh -- ok
[21] $ quilt pop -a --refresh -- ok
[32] $ quilt push -a --refresh -- ok
[43] $ quilt push -fa --refresh -- ok
[46] $ quilt pop -a --refresh -- ok
14 commands (14 passed, 0 failed)
PASS: auto-refresh
[test/backup-files.test]
[4] $ echo foo > foo -- ok
[5] $ echo bar > "space bar" -- ok
[6] $ sleep 1 -- ok
[7] $ /usr/share/quilt//scripts/backup-files -B backup/ -b foo -- ok
[10] $ ls -l foo | awk '{ print $2 }' -- ok
[12] $ ls -l backup/foo | awk '{ print $2 }' -- ok
[14] $ [ backup/foo -nt foo ] && echo "mtimes differ" -- ok
[16] $ /usr/share/quilt//scripts/backup-files -B backup/ -r foo -- ok
[18] $ ls -l foo | awk '{ print $2 }' -- ok
[22] $ /usr/share/quilt//scripts/backup-files -B backup/ -b -s -L foo -- ok
[24] $ ls -l foo | awk '{ print $2 }' -- ok
[26] $ ls -l backup/foo | awk '{ print $2 }' -- ok
[28] $ [ backup/foo -nt foo ] && echo "mtimes differ" -- ok
[31] $ echo modified > foo -- ok
[32] $ sleep 1 -- ok
[33] $ /usr/share/quilt//scripts/backup-files -B backup/ -r foo -- ok
[36] $ cat foo -- ok
[38] $ [ -e backup/foo ] && echo "backup/foo not deleted" -- ok
[39] $ [ -e backup ] && echo "backup directory not deleted" -- ok
[42] $ ln foo foo2 -- ok
[43] $ /usr/share/quilt//scripts/backup-files -B backup/ -b -s -L foo -- ok
[44] $ ls -l foo | awk '{ print $2 }' -- ok
[46] $ ls -l backup/foo | awk '{ print $2 }' -- ok
[49] $ /usr/share/quilt//scripts/backup-files -B backup/ -b -s -L foo2 -- ok
[50] $ ls -l foo | awk '{ print $2 }' -- ok
[52] $ ls -l foo2 | awk '{ print $2 }' -- ok
[54] $ ls -l backup/foo | awk '{ print $2 }' -- ok
[56] $ ls -l backup/foo2 | awk '{ print $2 }' -- ok
[60] $ rm -f foo foo2 -- ok
[61] $ /usr/share/quilt//scripts/backup-files -B backup/ -r -s foo -- ok
[62] $ ls -l foo | awk '{ print $2 }' -- ok
[64] $ ls -l backup/foo2 | awk '{ print $2 }' -- ok
[66] $ [ -e backup/foo ] && echo "backup/foo not deleted" -- ok
[67] $ [ ! -e foo2 ] || echo "file foo2 shouldn't exist" -- ok
[69] $ /usr/share/quilt//scripts/backup-files -B backup/ -r -s foo2 -- ok
[70] $ ls -l foo | awk '{ print $2 }' -- ok
[72] $ ls -l foo2 | awk '{ print $2 }' -- ok
[74] $ [ -e backup/foo2 ] && echo "backup/foo2 not deleted" -- ok
[75] $ [ -e backup ] && echo "backup directory not deleted" -- ok
[78] $ /usr/share/quilt//scripts/backup-files -B backup/ -b -s foo -- ok
[79] $ touch -r foo foo.timeref -- ok
[80] $ /usr/share/quilt//scripts/backup-files -B backup/ -r -s -t foo -- ok
[82] $ ls -l foo | awk '{ print $2 }' -- ok
[84] $ [ foo -nt foo.timeref ] || echo "touch failed" -- ok
[87] $ /usr/share/quilt//scripts/backup-files -B backup/ -b -s -L foo "space bar" -- ok
[88] $ touch -r "space bar" bar.timeref -- ok
[89] $ ls -l backup/foo | awk '{ print $2 }' -- ok
[91] $ ls -l "backup/space bar" | awk '{ print $2 }' -- ok
[93] $ mkdir tmp -- ok
[94] $ cd tmp -- ok
[95] $ /usr/share/quilt//scripts/backup-files -B ../backup/ -r -s -k foo "space bar" -- ok
[96] $ cd .. -- ok
[98] $ ls -l foo | awk '{ print $2 }' -- ok
[100] $ ls -l "space bar" | awk '{ print $2 }' -- ok
[102] $ ls -l backup/foo | awk '{ print $2 }' -- ok
[104] $ ls -l "backup/space bar" | awk '{ print $2 }' -- ok
[106] $ ls -l tmp/foo | awk '{ print $2 }' -- ok
[108] $ ls -l "tmp/space bar" | awk '{ print $2 }' -- ok
[110] $ rm -rf tmp -- ok
[113] $ rm -f foo "space bar" -- ok
[114] $ /usr/share/quilt//scripts/backup-files -B backup/ -r -s -t - -- ok
[115] $ cat foo -- ok
[117] $ cat "space bar" -- ok
[119] $ [ "space bar" -nt bar.timeref ] || echo "touch failed" -- ok
[122] $ mkdir "dir with spaces" -- ok
[123] $ /usr/share/quilt//scripts/backup-files -B backup/ -b -s -L new "dir with spaces/space file" -- ok
[124] $ echo data > new -- ok
[125] $ echo data2 > "dir with spaces/space file" -- ok
[126] $ ls -l backup/new | awk '{ print $5 }' -- ok
[128] $ ls -l "backup/dir with spaces/space file" | awk '{ print $5 }' -- ok
[130] $ /usr/share/quilt//scripts/backup-files -B backup/ -r -s - -- ok
[131] $ [ ! -e backup/new ] || echo "file backup/new shouldn't exist" -- ok
[132] $ [ ! -e new ] || echo "file new shouldn't exist" -- ok
[133] $ [ ! -e "backup/dir with spaces/space file" ] || echo "file backup/dir with spaces/space file shouldn't exist" -- ok
[134] $ [ ! -e "dir with spaces/space file" ] || echo "file dir with spaces/space file shouldn't exist" -- ok
[137] $ echo data > "dir with spaces/space file" -- ok
[138] $ /usr/share/quilt//scripts/backup-files -B backup/ -b -L "dir with spaces/space file" -- ok
[140] $ rm -rf "dir with spaces" -- ok
[141] $ /usr/share/quilt//scripts/backup-files -B backup/ -r - -- ok
[143] $ cat "dir with spaces/space file" -- ok
[145] $ [ -e backup ] && echo "backup directory not deleted" -- ok
[148] $ /usr/share/quilt//scripts/backup-files -B backup/ -b -s -L -f - -- ok
[152] $ echo data > new -- ok
[153] $ echo modified > foo -- ok
[154] $ rm -f "space bar" -- ok
[155] $ [ -e backup/new -a ! -s backup/new ] || echo "file backup/new isn't empty" -- ok
[156] $ ls -l backup/new | awk '{ print $5 }' -- ok
[158] $ cat backup/foo -- ok
[160] $ cat "backup/space bar" -- ok
[162] $ /usr/share/quilt//scripts/backup-files -B backup/ -r -s -f - -- ok
[166] $ [ ! -e backup/new ] || echo "file backup/new shouldn't exist" -- ok
[167] $ [ ! -e new ] || echo "file new shouldn't exist" -- ok
[168] $ cat foo -- ok
[170] $ cat "space bar" -- ok
[174] $ /usr/share/quilt//scripts/backup-files -B backup/ -b -L -f - -- ok
[181] $ ln "space bar" "linked space" -- ok
[182] $ ls -l foo | awk '{ print $2 }' -- ok
[184] $ ls -l "space bar" | awk '{ print $2 }' -- ok
[186] $ /usr/share/quilt//scripts/backup-files -B backup/ -L - -- ok
[187] $ ls -l foo | awk '{ print $2 }' -- ok
[189] $ ls -l "space bar" | awk '{ print $2 }' -- ok
[191] $ [ ! -e new ] || echo "file new shouldn't exist" -- ok
[193] $ /usr/share/quilt//scripts/backup-files -B backup/ -L - -- ok
[194] $ ls -l foo | awk '{ print $2 }' -- ok
[196] $ ls -l "space bar" | awk '{ print $2 }' -- ok
[198] $ [ ! -e new ] || echo "file new shouldn't exist" -- ok
[199] $ /usr/share/quilt//scripts/backup-files -B backup/ -r - | sort -- ok
[203] $ rm "linked space" -- ok
[206] $ /usr/share/quilt//scripts/backup-files -B snapshot/ -c -f - -- ok
[215] $ ls -l foo | awk '{ print $2 }' -- ok
[217] $ ls -l "space bar" | awk '{ print $2 }' -- ok
[219] $ ls -l "dir with spaces/space file" | awk '{ print $2 }' -- ok
[221] $ [ ! -e new ] || echo "file new shouldn't exist" -- ok
[222] $ ls -l snapshot/new | awk '{ print $2 }' -- ok
[224] $ ls -l snapshot/foo | awk '{ print $2 }' -- ok
[226] $ ls -l snapshot/"space bar" | awk '{ print $2 }' -- ok
[228] $ ls -l snapshot/"dir with spaces/space file" | awk '{ print $2 }' -- ok
[230] $ [ ! -s new ] || echo "file snapshot/new should be empty" -- ok
[231] $ rm -rf snapshot -- ok
[234] $ mkdir dir -- ok
[235] $ ln -s foo dir/link -- ok
[236] $ readlink dir/link -- ok
[238] $ /usr/share/quilt//scripts/backup-files -B backup/ -b dir/link -- ok
[240] $ readlink backup/dir/link -- ok
[242] $ rm -f dir/link -- ok
[243] $ echo crap > dir/link -- ok
[244] $ /usr/share/quilt//scripts/backup-files -B backup/ -r -k dir/link -- ok
[246] $ readlink dir/link -- ok
[250] $ rm -f dir/link -- ok
[251] $ echo crap > dir/link -- ok
[252] $ /usr/share/quilt//scripts/backup-files -B backup/ -r -k -f - -- ok
[255] $ readlink dir/link -- ok
[259] $ rm -f dir/link -- ok
[260] $ echo crap > dir/link -- ok
[261] $ /usr/share/quilt//scripts/backup-files -B backup/ -r - -- ok
[263] $ readlink dir/link -- ok
136 commands (136 passed, 0 failed)
PASS: backup-files
[test/colon-in-patch-name.test]
[4] $ mkdir patches -- ok
[6] $ quilt new "patch_with:strange[name]" -- ok
[9] $ echo foo > foo -- ok
[10] $ quilt add foo -- ok
[13] $ quilt files -- ok
[16] $ echo bar > foo -- ok
[17] $ quilt diff -p ab -P "patch_with:strange[name]" -- ok
[26] $ quilt refresh -p ab -- ok
[29] $ quilt applied -- ok
[32] $ quilt pop -q -- ok
[36] $ quilt next -- ok
[39] $ quilt push -q "patch_with:strange[name]" -- ok
[43] $ quilt top -- ok
[46] $ quilt rename "another:strange(name)" -- ok
[49] $ quilt new "{%'}.patch" -- ok
[52] $ quilt add foo -- ok
[55] $ echo baz > foo -- ok
[57] $ quilt previous -- ok
[60] $ quilt series -- ok
[64] $ quilt refresh -p0 "{%'}.patch" -- ok
[67] $ cat "patches/{%'}.patch" -- ok
[76] $ quilt pop "another:strange(name)" -- ok
[82] $ quilt remove foo -- ok
23 commands (23 passed, 0 failed)
PASS: colon-in-patch-name
[test/comments.test]
[4] $ mkdir patches -- ok
[6] $ echo one > f -- ok
[7] $ cat > patches/test.diff -- ok
[20] $ cat > patches/series -- ok
[23] $ quilt push -- ok
[29] $ quilt refresh -- ok
[31] $ cat patches/test.diff -- ok
[44] $ quilt refresh -c -- ok
[47] $ cat patches/test.diff -- ok
[62] $ quilt refresh -- ok
[65] $ cat patches/test.diff -- ok
11 commands (11 passed, 0 failed)
PASS: comments
[test/conflicts.test]
[5] $ mkdir patches -- ok
[7] $ cat > one.txt -- ok
[24] $ quilt new a.diff -- ok
[26] $ echo 0 -- ok
[29] $ quilt add one.txt -- ok
[31] $ echo 0 -- ok
[34] $ mv one.txt one.orig -- ok
[35] $ sed -e "s/4/4+/" -e 's/d/d+/' one.orig > one.txt -- ok
[36] $ quilt refresh -- ok
[38] $ echo 0 -- ok
[41] $ quilt pop -q -- ok
[44] $ echo 0 -- ok
[48] $ sed -e "s/^\\([17]\\)\$/\\1-/" one.orig > one.txt -- ok
[49] $ quilt push -q -- ok
[52] $ echo 0 -- ok
[55] $ quilt pop -q -- ok
[58] $ echo 0 -- ok
[61] $ sed -e "s/^\\([1267]\\)\$/\\1-/" one.orig > one.txt -- ok
[62] $ quilt push -q -- ok
[65] $ echo 0 -- ok
[68] $ quilt pop -q -- ok
[71] $ echo 0 -- ok
[75] $ sed -e "s/^\\([123567]\\)\$/\\1-/" one.orig > one.txt -- ok
[76] $ quilt push -q -- ok
[80] $ echo 1 -- ok
[83] $ quilt push -qf -- ok
[87] $ echo 1 -- ok
[90] $ mv one.txt one.x -- ok
[91] $ sed -e "s/4/4+/" one.x > one.txt -- ok
[92] $ rm -f one.x -- ok
[93] $ quilt diff -z | grep -v "^\\(---\\|+++\\)" -- ok
[105] $ echo 0 -- ok
[108] $ quilt diff | grep -v "^\\(---\\|+++\\)" -- ok
[129] $ echo 0 -- ok
[132] $ quilt refresh -- ok
[134] $ echo 0 -- ok
[137] $ cat patches/a.diff | grep -v "^\\(---\\|+++\\)" -- ok
[159] $ quilt pop -q -- ok
[162] $ echo 0 -- ok
39 commands (39 passed, 0 failed)
PASS: conflicts
[test/create-delete.test]
[4] $ mkdir patches -- ok
[6] $ echo delete > delete -- ok
[7] $ quilt new test.diff -- ok
[10] $ quilt add create -- ok
[13] $ echo create > create -- ok
[14] $ quilt refresh -- ok
[17] $ quilt add delete -- ok
[20] $ rm -f delete -- ok
[21] $ quilt refresh -- ok
[23] $ quilt header -r -- ok
[31] $ quilt patches -v create -- ok
[33] $ quilt patches delete -- ok
[36] $ quilt pop -q -- ok
[40] $ quilt patches create -- ok
[42] $ quilt patches -v delete -- ok
[44] $ quilt patches -- /dev/null dev/null null --- -- ok
[46] $ echo create > create -- ok
[47] $ rm -f delete -- ok
[48] $ patch -p1 --dry-run < patches/test.diff -- ok
19 commands (19 passed, 0 failed)
PASS: create-delete
[test/delete.test]
[3] $ mkdir patches -- ok
[5] $ cat > test.txt -- ok
[8] $ quilt new test1 -- ok
[11] $ quilt add test.txt -- ok
[14] $ cat > test.txt -- ok
[17] $ quilt refresh -- ok
[20] $ quilt new test2 -- ok
[23] $ quilt add test.txt -- ok
[26] $ cat > test.txt -- ok
[29] $ quilt refresh -- ok
[32] $ quilt delete test1 -- ok
[35] $ quilt pop -- ok
[41] $ quilt series -- ok
[45] $ quilt delete -n -- ok
[48] $ quilt series -- ok
[51] $ quilt pop -- ok
[57] $ quilt delete test1 -- ok
[60] $ quilt series -- ok
[62] $ echo "test1" > patches/series -- ok
[63] $ quilt delete -n -- ok
[66] $ quilt series -- ok
[69] $ echo "test3" > patches/series -- ok
[70] $ echo "test3" > .pc/applied-patches -- ok
[71] $ mkdir -p .pc/test3/dir -- ok
[72] $ touch .pc/test3/dir/file -- ok
[73] $ chmod a-rx .pc/test3/dir -- ok
[77] $ quilt delete "test3" -- ok
[81] $ chmod a+rx .pc/test3/dir -- ok
[83] $ find .pc/test3 -- ok
[88] $ quilt applied -- ok
[91] $ quilt series -- ok
[94] $ quilt delete -- ok
[97] $ quilt delete test3 -- ok
33 commands (33 passed, 0 failed)
PASS: delete
[test/dir-a-b.test]
[1] $ mkdir patches -- ok
[3] $ echo a > test.txt -- ok
[4] $ echo d > test3.txt -- ok
[6] $ cat > patches/ab.diff -- ok
[21] $ echo "ab.diff" > patches/series -- ok
[23] $ quilt push -q -- ok
[27] $ quilt diff -p ab --no-index -- ok
[42] $ rm -f patches/ab.diff -- ok
[43] $ quilt refresh -p ab --no-index -- ok
[46] $ cat patches/ab.diff -- ok
[61] $ quilt pop -qR -- ok
11 commands (11 passed, 0 failed)
PASS: dir-a-b
[test/dotglob.test]
[1] $ mkdir patches -- ok
[3] $ quilt new dotglob.diff -- ok
[6] $ quilt add .foo -- ok
[9] $ echo dot-foo > .foo -- ok
[10] $ quilt refresh -- ok
[13] $ quilt pop -q -- ok
[17] $ quilt push -q -- ok
7 commands (7 passed, 0 failed)
PASS: dotglob
[test/duplicate-patch-in-series.test]
[4] $ mkdir patches -- ok
[5] $ echo "old line" > file.txt -- ok
[7] $ cat > patches/first.patch -- ok
[14] $ cat > patches/series -- ok
[18] $ quilt push -- ok
[24] $ quilt push -- ok
[27] $ quilt pop -- ok
[33] $ quilt push -qa -- ok
[36] $ quilt pop -q -- ok
9 commands (9 passed, 0 failed)
PASS: duplicate-patch-in-series
[test/edit.test]
[1] $ mkdir patches subdir -- ok
[4] $ cat > editor -- ok
[9] $ chmod +x editor -- ok
[10] $ export EDITOR=/usr/lib/quilt/ptest/test/edit.test.6105/editor -- ok
[12] $ quilt new patch -- ok
[15] $ echo foobar > foobar -- ok
[16] $ quilt edit foobar -- ok
[20] $ cat foobar -- ok
[23] $ cd subdir -- ok
[24] $ echo foo > foo -- ok
[25] $ quilt edit foo -- ok
[28] $ cd .. -- ok
[30] $ cat subdir/foo -- ok
[33] $ quilt files -- ok
[37] $ quilt refresh -- ok
[41] $ echo foobaz > foobaz -- ok
[42] $ cat > editor -- ok
[47] $ quilt edit foobaz -- ok
[51] $ [ ! -e foobaz ] || echo "File foobaz shouldn't exist" -- ok
[55] $ cat > editor -- ok
[59] $ quilt edit nofoo -- ok
[66] $ rm -f foobar -- ok
[67] $ quilt refresh -- ok
[69] $ quilt diff -p ab --no-index foobar -- ok
[75] $ quilt edit foobar -- ok
[79] $ [ ! -e foobar ] || echo "File foobar shouldn't exist" -- ok
[82] $ cat > editor -- ok
[87] $ quilt edit foo2 -- ok
[90] $ cat foo2 -- ok
[93] $ quilt files -v -- ok
30 commands (30 passed, 0 failed)
PASS: edit
[test/empty-files.test]
[4] $ mkdir patches -- ok
[5] $ echo "will be deleted" > deleted1 -- ok
[6] $ echo "will be emptied" > emptied1 -- ok
[7] $ echo "will be deleted" > deleted2 -- ok
[8] $ echo "will be emptied" > emptied2 -- ok
[11] $ cat > patches/series -- ok
[15] $ cat > patches/using-filenames.patch -- ok
[27] $ cat > patches/using-timestamps.patch -- ok
[40] $ quilt push -- ok
[46] $ [ ! -e deleted1 ] && echo "File deleted1 does not exist" -- ok
[48] $ [ -e deleted1 -a ! -s deleted1 ] && echo "File deleted1 is empty" -- ok
[49] $ [ ! -e emptied1 ] && echo "File emptied1 does not exist" -- ok
[50] $ [ -e emptied1 -a ! -s emptied1 ] && echo "File emptied1 is empty" -- ok
[53] $ quilt push -- ok
[59] $ [ ! -e deleted2 ] && echo "File deleted2 does not exist" -- ok
[61] $ [ -e deleted2 -a ! -s deleted2 ] && echo "File deleted2 is empty" -- ok
[62] $ [ ! -e emptied2 ] && echo "File emptied2 does not exist" -- ok
[63] $ [ -e emptied2 -a ! -s emptied2 ] && echo "File emptied2 is empty" -- ok
[67] $ quilt pop -aq -- ok
[72] $ quilt new fold.patch -- ok
[75] $ quilt fold < patches/using-filenames.patch -- ok
[78] $ [ ! -e deleted1 ] && echo "File deleted1 does not exist" -- ok
[80] $ [ -e deleted1 -a ! -s deleted1 ] && echo "File deleted1 is empty" -- ok
[81] $ [ ! -e emptied1 ] && echo "File emptied1 does not exist" -- ok
[82] $ [ -e emptied1 -a ! -s emptied1 ] && echo "File emptied1 is empty" -- ok
[85] $ quilt fold < patches/using-timestamps.patch -- ok
[88] $ [ ! -e deleted2 ] && echo "File deleted2 does not exist" -- ok
[90] $ [ -e deleted2 -a ! -s deleted2 ] && echo "File deleted2 is empty" -- ok
[91] $ [ ! -e emptied2 ] && echo "File emptied2 does not exist" -- ok
[92] $ [ -e emptied2 -a ! -s emptied2 ] && echo "File emptied2 is empty" -- ok
[96] $ quilt delete -- ok
[100] $ quilt push -q -- ok
[104] $ quilt refresh -pab --sort --no-index -- ok
[106] $ quilt pop -q -- ok
[110] $ quilt push -- ok
[116] $ [ ! -e deleted1 ] && echo "File deleted1 does not exist" -- ok
[118] $ [ -e deleted1 -a ! -s deleted1 ] && echo "File deleted1 is empty" -- ok
[119] $ [ ! -e emptied1 ] && echo "File emptied1 does not exist" -- ok
[120] $ [ -e emptied1 -a ! -s emptied1 ] && echo "File emptied1 is empty" -- ok
[123] $ cat patches/using-filenames.patch -- ok
40 commands (40 passed, 0 failed)
PASS: empty-files
[test/empty.test]
[1] $ mkdir patches -- ok
[3] $ cat > patches/series -- ok
[6] $ touch patches/empty1.diff patches/empty2.diff -- ok
[8] $ quilt push -qa -- ok
[15] $ quilt rename empty3.diff -- ok
[18] $ quilt pop -qa -- ok
[23] $ quilt new empty_new.diff -- ok
[26] $ quilt pop -q -- ok
[30] $ quilt delete empty_new.diff -- ok
[33] $ quilt rename -P empty3.diff empty_new.diff -- ok
10 commands (10 passed, 0 failed)
PASS: empty
[test/example1.test]
[4] $ mkdir patches -- ok
[6] $ cat > Oberon.txt -- ok
[12] $ quilt new flower.diff -- ok
[15] $ quilt files -- ok
[16] $ quilt add Oberon.txt -- ok
[19] $ cat >> Oberon.txt -- ok
[26] $ quilt refresh -p ab -- ok
[29] $ cat patches/flower.diff -- ok
[42] $ sed -ne '1,4p' Oberon.txt > Oberon.new -- ok
[43] $ echo "Fetch me that flower; the herb I shew'd thee once:" >> Oberon.new -- ok
[44] $ sed -e '1,4d' Oberon.txt >> Oberon.new -- ok
[45] $ mv Oberon.new Oberon.txt -- ok
[46] $ quilt diff -z -p ab -- ok
[60] $ quilt diff -p ab -- ok
[74] $ quilt refresh -- ok
[77] $ quilt top -- ok
[80] $ quilt files -- ok
[83] $ quilt patches Oberon.txt -- ok
[85] $ quilt pop -f -- ok
[91] $ quilt files patches/flower.diff -- ok
[94] $ sed -e "s/girls/maidens/" Oberon.txt > Oberon.new -- ok
[95] $ mv Oberon.new Oberon.txt -- ok
[96] $ quilt push -- ok
[103] $ quilt push -f -- ok
[110] $ cat >> Oberon.txt -- ok
[116] $ quilt refresh -p ab -- ok
[118] $ rm -f Oberon.txt.rej -- ok
[120] $ cat Oberon.txt -- ok
[130] $ cat patches/flower.diff -- ok
[144] $ quilt grep love -- ok
30 commands (30 passed, 0 failed)
PASS: example1
[test/failbackup.test]
[1] $ mkdir patches -- ok
[3] $ quilt new test.diff -- ok
[6] $ quilt add test.txt -- ok
[8] $ cat > test.txt -- ok
[10] $ quilt refresh -- ok
[15] $ chmod -w patches -- ok
[16] $ cat > test.txt -- ok
[18] $ quilt refresh --backup -- ok
[20] $ echo 1 -- ok
[23] $ chmod +w patches -- ok
10 commands (10 passed, 0 failed)
PASS: failbackup
[test/faildiff.test]
[1] $ mkdir patches -- ok
[3] $ quilt new test.diff -- ok
[6] $ cat > test.txt -- ok
[8] $ quilt add test.txt -- ok
[13] $ chmod -r test.txt -- ok
[15] $ quilt refresh -- ok
[18] $ echo 1 -- ok
[21] $ chmod +r test.txt -- ok
[25] $ printf "\\002\\000\\001" > test.bin -- ok
[26] $ quilt add test.bin -- ok
[29] $ printf "\\003\\000\\001" > test.bin -- ok
[30] $ quilt diff -pab --no-index 2>/dev/null -- ok
[32] $ quilt diff -pab --no-index >/dev/null -- ok
[34] $ echo 1 -- ok
[37] $ quilt refresh -- ok
[39] $ echo 1 -- ok
16 commands (16 passed, 0 failed)
PASS: faildiff
[test/failpop.test]
[1] $ mkdir patches -- ok
[3] $ cat > test.txt -- ok
[6] $ quilt new test.diff -- ok
[8] $ echo 0 -- ok
[11] $ quilt add test.txt -- ok
[13] $ echo 0 -- ok
[16] $ cat >> test.txt -- ok
[19] $ quilt refresh -- ok
[21] $ echo 0 -- ok
[24] $ sed -e "s/ /_/g" patches/test.diff > patches/test.new -- ok
[25] $ mv patches/test.new patches/test.diff -- ok
[26] $ quilt pop -- ok
[28] $ echo 1 -- ok
13 commands (13 passed, 0 failed)
PASS: failpop
[test/fold.test]
[1] $ mkdir patches -- ok
[3] $ cat > patches/series -- ok
[6] $ cat > patches/patch1.diff -- ok
[16] $ quilt push -q -- ok
[20] $ quilt files -- ok
[24] $ quilt fold -q -- ok
[34] $ quilt diff -p ab -- ok
[48] $ cd dir -- ok
[49] $ quilt fold -q -- ok
[56] $ cd .. -- ok
[57] $ quilt diff -p ab -- ok
11 commands (11 passed, 0 failed)
PASS: fold
[test/formats.test]
[4] $ mkdir -p d/patches -- ok
[5] $ cd d -- ok
[7] $ cat > test.txt -- ok
[14] $ quilt new test -- ok
[17] $ quilt add test.txt -- ok
[20] $ cat > test.txt -- ok
[27] $ quilt diff -- ok
[40] $ quilt diff --no-index -- ok
[51] $ quilt diff -R -- ok
[64] $ quilt diff -U1 -- ok
[75] $ quilt diff -c -- ok
[94] $ quilt diff -C1 -- ok
[109] $ quilt diff -p ab -- ok
13 commands (13 passed, 0 failed)
PASS: formats
[test/half-applies.test]
[1] $ mkdir patches -- ok
[3] $ echo foo > foo.orig -- ok
[4] $ echo foo2 > foo -- ok
[5] $ echo bar > bar.orig -- ok
[6] $ echo bar2 > bar -- ok
[7] $ diff -u foo.orig foo >> patches/foorab.diff -- ok
[8] $ diff -u bar bar.orig >> patches/foorab.diff -- ok
[9] $ mv foo.orig foo -- ok
[10] $ mv bar.orig bar -- ok
[11] $ echo foorab.diff -p0 > patches/series -- ok
[12] $ quilt push -- ok
[19] $ echo 1 -- ok
[22] $ quilt push -- ok
[29] $ echo 1 -- ok
[32] $ quilt push -qf -- ok
[36] $ echo 1 -- ok
[39] $ quilt diff -- ok
[47] $ echo 0 -- ok
18 commands (18 passed, 0 failed)
PASS: half-applies
[test/hard-linked-patch.test]
[4] $ mkdir patches -- ok
[6] $ cat > patches/patch -- ok
[12] $ echo patch -p0 > patches/series -- ok
[13] $ ln patches/patch hardlink -- ok
[15] $ echo a > file -- ok
[16] $ quilt push -q -- ok
[20] $ echo c > file -- ok
[21] $ quilt refresh --no-index -- ok
[24] $ cat patches/patch -- ok
[31] $ cat hardlink -- ok
[40] $ rm -f hardlink -- ok
[41] $ ln patches/patch hardlink -- ok
[43] $ quilt header -r -- ok
[47] $ cat patches/patch -- ok
[55] $ cat hardlink -- ok
15 commands (15 passed, 0 failed)
PASS: hard-linked-patch
[test/header.test]
[1] $ mkdir patches -- ok
[3] $ echo foo > foo -- ok
[4] $ quilt new patch -- ok
[7] $ quilt add foo -- ok
[10] $ echo bar > foo -- ok
[11] $ quilt refresh -p ab -- ok
[14] $ mv patches/patch patches/patch~ -- ok
[15] $ echo Header > patches/patch -- ok
[16] $ cat patches/patch~ >> patches/patch -- ok
[17] $ quilt header -- ok
[20] $ quilt header -r -- ok
[24] $ quilt header -- ok
[27] $ quilt header -a -- ok
[31] $ quilt header -- ok
[35] $ cat patches/patch -- ok
[46] $ echo -n "No trailing newline" | quilt header -r -- ok
[49] $ cat patches/patch -- ok
17 commands (17 passed, 0 failed)
PASS: header
[test/help.test]
[3] $ mkdir $QUILT_PC -- ok
[4] $ echo 2 > $QUILT_PC/.version -- ok
[6] $ quilt add -h | grep -c '^Usage:' -- ok
[9] $ quilt annotate -h | grep -c '^Usage:' -- ok
[12] $ quilt applied -h | grep -c '^Usage:' -- ok
[15] $ quilt delete -h | grep -c '^Usage:' -- ok
[18] $ quilt diff -h | grep -c '^Usage:' -- ok
[21] $ quilt edit -h | grep -c '^Usage:' -- ok
[24] $ quilt files -h | grep -c '^Usage:' -- ok
[27] $ quilt fold -h | grep -c '^Usage:' -- ok
[30] $ quilt fork -h | grep -c '^Usage:' -- ok
[33] $ quilt graph -h | grep -c '^Usage:' -- ok
[36] $ quilt grep -h | grep -c '^Usage:' -- ok
[39] $ quilt header -h | grep -c '^Usage:' -- ok
[42] $ quilt import -h | grep -c '^Usage:' -- ok
[45] $ quilt mail -h | grep -c '^Usage:' -- ok
[48] $ quilt new -h | grep -c '^Usage:' -- ok
[51] $ quilt next -h | grep -c '^Usage:' -- ok
[54] $ quilt patches -h | grep -c '^Usage:' -- ok
[57] $ quilt pop -h | grep -c '^Usage:' -- ok
[60] $ quilt previous -h | grep -c '^Usage:' -- ok
[63] $ quilt push -h | grep -c '^Usage:' -- ok
[66] $ quilt refresh -h | grep -c '^Usage:' -- ok
[69] $ quilt remove -h | grep -c '^Usage:' -- ok
[72] $ quilt rename -h | grep -c '^Usage:' -- ok
[75] $ quilt series -h | grep -c '^Usage:' -- ok
[78] $ quilt setup -h | grep -c '^Usage:' -- ok
[81] $ quilt snapshot -h | grep -c '^Usage:' -- ok
[84] $ quilt top -h | grep -c '^Usage:' -- ok
[87] $ quilt unapplied -h | grep -c '^Usage:' -- ok
[90] $ quilt upgrade -h | grep -c '^Usage:' -- ok
31 commands (31 passed, 0 failed)
PASS: help
[test/import.test]
[1] $ mkdir patches -- ok
[3] $ quilt new patch1.diff -- ok
[6] $ quilt add f -- ok
[9] $ echo f > f -- ok
[11] $ quilt refresh -- ok
[14] $ quilt new patchR.diff -- ok
[17] $ quilt add f -- ok
[20] $ rm -f f -- ok
[22] $ quilt refresh -- ok
[25] $ quilt fork patchRp0.diff -- ok
[28] $ quilt refresh -p0 -- ok
[31] $ quilt pop -a -- ok
[40] $ mkdir t -- ok
[41] $ mv patches/patch1.diff t/patch1.diff -- ok
[42] $ mv patches/patchR.diff t/patchR.diff -- ok
[43] $ mv patches/patchRp0.diff t/patchRp0.diff -- ok
[46] $ rm -rf patches/ .pc/ -- ok
[47] $ mkdir patches -- ok
[48] $ quilt import t/patch1.diff -- ok
[51] $ quilt push -- ok
[57] $ quilt new patch2.diff -- ok
[60] $ quilt add g -- ok
[63] $ echo g > g -- ok
[65] $ quilt refresh -- ok
[68] $ quilt pop -- ok
[74] $ quilt header -a -- ok
[78] $ quilt pop -- ok
[84] $ quilt delete patch1 -- ok
[87] $ cat patches/series -- ok
[92] $ quilt import missing.diff -- ok
[95] $ quilt import patches/patch1.diff -- ok
[98] $ quilt import patches/patch2.diff -- ok
[103] $ quilt import t/patch1.diff -- ok
[106] $ quilt import -f t/patch1.diff -- ok
[110] $ sed -e 's/original/new/' patches/patch1.diff > t/patch1.diff -- ok
[111] $ quilt import t/patch1.diff -- ok
[114] $ quilt import -f t/patch1.diff -- ok
[121] $ quilt import -d a -f t/patch1.diff -- ok
[125] $ head -n 3 patches/patch1.diff -- ok
[130] $ quilt import -d n -f t/patch1.diff -- ok
[133] $ quilt header patch1 -- ok
[136] $ quilt delete patch1 -- ok
[142] $ cp patches/patch1.diff t/patch1.patch -- ok
[143] $ quilt import t/patch1.patch -- ok
[146] $ ls patches/ -- ok
[152] $ cat patches/series -- ok
[156] $ quilt delete patch1.diff -- ok
[160] $ rm -rf patches/ .pc/ -- ok
[161] $ mkdir patches -- ok
[162] $ quilt import -R t/patchR.diff -- ok
[165] $ quilt push -- ok
[171] $ cat f -- ok
[174] $ cat patches/series -- ok
[178] $ echo "# Test of -R import" > patches/series -- ok
[179] $ echo "patchR.diff -R # This patch was originally -R -p1" >> patches/series -- ok
[182] $ quilt refresh -- ok
[185] $ cat patches/series -- ok
[189] $ touch f -- ok
[190] $ quilt pop -- ok
[197] $ rm -rf patches/ .pc/ -- ok
[198] $ mkdir patches -- ok
[199] $ quilt import -R -p0 t/patchRp0.diff -- ok
[202] $ quilt push -- ok
[208] $ cat f -- ok
[211] $ cat patches/series -- ok
[215] $ quilt refresh -- ok
[218] $ cat patches/series -- ok
[221] $ touch f -- ok
[222] $ quilt pop -- ok
[229] $ rm -rf patches/ .pc/ -- ok
[230] $ mkdir patches -- ok
[231] $ quilt import t/patch1.diff t/patchR.diff -- ok
[235] $ cat patches/series -- ok
[239] $ rm -rf patches/ .pc/ -- ok
[240] $ mkdir patches -- ok
[241] $ quilt import t/patchR.diff -- ok
[243] $ quilt import t/patch1.diff -- ok
[246] $ cat patches/series -- ok
[251] $ touch empty.patch -- ok
[252] $ cd t -- ok
[253] $ touch empty2.patch -- ok
[254] $ quilt import ../empty.patch -- ok
[256] $ quilt import /usr/lib/quilt/ptest/test/import.test.9987/t/empty2.patch -- ok
[260] $ cd .. -- ok
[261] $ quilt delete -rn -- ok
[263] $ quilt delete -rn -- ok
[265] $ quilt import t/patch1.diff -P patch1-renamed.diff -- ok
[267] $ quilt push -- ok
[272] $ cat f -- ok
89 commands (89 passed, 0 failed)
PASS: import
[test/import2.test]
[3] $ mkdir patches -- ok
[5] $ quilt new patch1.diff -- ok
[8] $ quilt add f -- ok
[11] $ echo f > f -- ok
[13] $ quilt refresh -- ok
[16] $ quilt pop -- ok
[22] $ mkdir t -- ok
[23] $ gzip < patches/patch1.diff > t/patch1.diff.gz -- ok
[24] $ rm -f patches/patch1.diff -- ok
[27] $ rm -rf patches/ .pc/ -- ok
[28] $ mkdir patches -- ok
[29] $ quilt import t/patch1.diff.gz -- ok
[32] $ quilt push -- ok
[38] $ quilt new patch2.diff.gz -- ok
[41] $ quilt add g -- ok
[44] $ echo g > g -- ok
[46] $ quilt refresh -- ok
[49] $ quilt pop -- ok
[55] $ quilt header -a -- ok
[59] $ quilt pop -- ok
[65] $ quilt delete patch1 -- ok
[68] $ cat patches/series -- ok
[73] $ quilt import missing.diff.gz -- ok
[76] $ quilt import patches/patch1.diff.gz -- ok
[79] $ quilt import patches/patch2.diff.gz -- ok
[84] $ quilt import t/patch1.diff.gz -- ok
[87] $ quilt import -f t/patch1.diff.gz -- ok
[91] $ zcat patches/patch1.diff.gz | sed -e 's/original/new/' | gzip > t/patch1.diff.gz -- ok
[92] $ quilt import t/patch1.diff.gz -- ok
[95] $ quilt import -f t/patch1.diff.gz -- ok
[102] $ quilt import -d a -f t/patch1.diff.gz -- ok
[106] $ zcat patches/patch1.diff.gz | head -n 3 -- ok
[111] $ quilt import -d n -f t/patch1.diff.gz -- ok
[114] $ quilt header patch1 -- ok
[117] $ quilt delete patch1 -- ok
[123] $ cp patches/patch1.diff.gz t/patch1.patch.gz -- ok
[124] $ quilt import t/patch1.patch.gz -- ok
[127] $ ls patches/ -- ok
[133] $ cat patches/series -- ok
[137] $ quilt delete patch1.diff.gz -- ok
40 commands (40 passed, 0 failed)
PASS: import2
[test/merge.test]
[3] $ mkdir patches -- ok
[5] $ cat > abc.txt -- ok
[10] $ cat > patches/series -- ok
[15] $ cat > patches/a.diff -- ok
[22] $ cat > patches/b.diff -- ok
[29] $ cat > patches/c.diff -- ok
[36] $ quilt push -qa -- ok
[42] $ quilt diff -P b.diff >/dev/null -- ok
[44] $ quilt diff -P b.diff 2>/dev/null | grep -v "^\\(---\\|+++\\)" -- ok
[53] $ quilt diff --combine a.diff -P b.diff >/dev/null -- ok
[55] $ quilt diff --combine a.diff -P b.diff 2>/dev/null | grep -v "^\\(---\\|+++\\)" -- ok
[65] $ quilt diff --combine b.diff | grep -v "^\\(---\\|+++\\)" -- ok
[75] $ quilt diff --combine - | grep -v "^\\(---\\|+++\\)" -- ok
13 commands (13 passed, 0 failed)
PASS: merge
[test/missing-newline.test]
[1] $ mkdir patches -- ok
[3] $ echo foo > foo -- ok
[4] $ quilt new 1.patch -- ok
[7] $ quilt add foo -- ok
[10] $ echo bar > foo -- ok
[11] $ quilt refresh -p ab -- ok
[15] $ echo -n 1.patch > patches/series -- ok
[18] $ quilt new 2.patch -- ok
[20] $ cat patches/series -- ok
9 commands (9 passed, 0 failed)
PASS: missing-newline
[test/missing.test]
[1] $ mkdir patches -- ok
[3] $ cat > patches/series -- ok
[7] $ quilt push -qa -- ok
[14] $ quilt rename missing3.diff -- ok
[17] $ quilt pop -qa -- ok
5 commands (5 passed, 0 failed)
PASS: missing
[test/new-nosubdir.test]
[1] $ mkdir patches -- ok
[3] $ mkdir sub -- ok
[4] $ cd sub -- ok
[5] $ quilt new here.diff -- ok
4 commands (4 passed, 0 failed)
PASS: new-nosubdir
[test/new.test]
[1] $ mkdir patches -- ok
[3] $ echo reject > f -- ok
[4] $ echo p.diff > patches/series -- ok
[5] $ cat > patches/p.diff -- ok
[17] $ quilt push -- ok
[25] $ quilt push -f -- ok
[33] $ echo new > f -- ok
[34] $ quilt refresh -p ab -- ok
[36] $ cat patches/p.diff -- ok
9 commands (9 passed, 0 failed)
PASS: new
[test/no-file-to-patch.test]
[5] $ mkdir patches -- ok
[6] $ cat > patches/series -- ok
[8] $ cat > patches/one.patch -- ok
[14] $ quilt push -q -- ok
[24] $ echo 1 -- ok
5 commands (5 passed, 0 failed)
PASS: no-file-to-patch
[test/no-series.test]
[3] $ mkdir patches -- ok
[4] $ touch file -- ok
[6] $ quilt annotate file -- ok
[8] $ echo 1 -- ok
[11] $ quilt applied -- ok
[13] $ echo 1 -- ok
[16] $ quilt diff -- ok
[18] $ echo 1 -- ok
[21] $ quilt files -- ok
[23] $ echo 1 -- ok
[25] $ quilt files -v -- ok
[27] $ echo 1 -- ok
[30] $ quilt fork -- ok
[32] $ echo 1 -- ok
[35] $ quilt graph -- ok
[37] $ echo 1 -- ok
[40] $ quilt header -- ok
[42] $ echo 1 -- ok
[45] $ quilt next -- ok
[47] $ echo 1 -- ok
[50] $ quilt patches file -- ok
[52] $ echo 1 -- ok
[55] $ quilt pop -- ok
[57] $ echo 1 -- ok
[59] $ quilt pop -v -- ok
[61] $ echo 1 -- ok
[64] $ quilt previous -- ok
[66] $ echo 1 -- ok
[69] $ quilt push -- ok
[71] $ echo 1 -- ok
[73] $ quilt push -v -- ok
[75] $ echo 1 -- ok
[78] $ quilt refresh -- ok
[80] $ echo 1 -- ok
[83] $ quilt series -- ok
[85] $ echo 1 -- ok
[87] $ quilt series -v -- ok
[89] $ echo 1 -- ok
[92] $ quilt snapshot -- ok
[94] $ echo 1 -- ok
[97] $ quilt top -- ok
[99] $ echo 1 -- ok
[102] $ quilt unapplied -- ok
[104] $ echo 1 -- ok
44 commands (44 passed, 0 failed)
PASS: no-series
[test/nolink.test]
[1] $ mkdir patches -- ok
[4] $ echo foo > foo -- ok
[5] $ ln foo foo2 -- ok
[6] $ ls -l foo | awk '{ print $2 }' -- ok
[9] $ quilt new test.diff -- ok
[12] $ quilt add foo -- ok
[15] $ ls -l foo | awk '{ print $2 }' -- ok
[18] $ ls -l .pc/test.diff/foo | awk '{ print $2 }' -- ok
[21] $ echo "foo changed" > foo -- ok
[22] $ quilt refresh -- ok
[25] $ quilt new test2.diff -- ok
[28] $ quilt add foo -- ok
[31] $ ls -l foo | awk '{ print $2 }' -- ok
[34] $ ls -l .pc/test2.diff/foo | awk '{ print $2 }' -- ok
[37] $ echo "foo changed again" > foo -- ok
[38] $ quilt refresh -- ok
[41] $ quilt pop -q -- ok
[45] $ ls -l foo | awk '{ print $2 }' -- ok
[48] $ ls -l .pc/test.diff/foo | awk '{ print $2 }' -- ok
[51] $ quilt pop -q -- ok
[55] $ ls -l foo | awk '{ print $2 }' -- ok
[59] $ echo bar > bar -- ok
[60] $ quilt push -q -- ok
[64] $ quilt add bar -- ok
[66] $ echo "bar changed" > bar -- ok
[67] $ quilt revert bar -- ok
[70] $ ls -l bar | awk '{ print $2 }' -- ok
[73] $ quilt pop -q -- ok
28 commands (28 passed, 0 failed)
PASS: nolink
[test/null-bug.test]
[1] $ mkdir patches -- ok
[3] $ echo file > file -- ok
[4] $ quilt new remove.diff -- ok
[7] $ quilt add file -- ok
[13] $ rm -f file -- ok
[14] $ quilt diff -p0 -- ok
[22] $ quilt refresh -p0 -- ok
[25] $ quilt pop -q -- ok
[29] $ quilt push -q -- ok
9 commands (9 passed, 0 failed)
PASS: null-bug
[test/one.test]
[6] $ mkdir patches -- ok
[8] $ mkdir dir -- ok
[9] $ echo "This is file one." > dir/file1 -- ok
[10] $ quilt new patch1.diff -- ok
[13] $ quilt add dir/file1 -- ok
[16] $ quilt add file2 -- ok
[19] $ quilt diff -- ok
[20] $ quilt diff -z -- ok
[21] $ quilt refresh -- ok
[24] $ echo "This is file two." > file2 -- ok
[25] $ quilt diff -p ab -- ok
[33] $ quilt diff -z -p ab -- ok
[41] $ quilt refresh -- ok
[44] $ quilt diff -z -- ok
[45] $ echo "Another line has been added." >> dir/file1 -- ok
[46] $ quilt diff -z -p ab -- ok
[55] $ quilt diff -z -p ab dir/file1 -- ok
[64] $ quilt refresh -- ok
[67] $ quilt new patch2.diff -- ok
[70] $ quilt add dir/file3 -- ok
[73] $ echo "This is file three." > dir/file3 -- ok
[74] $ quilt refresh -- ok
[77] $ quilt add -P patch1 dir/file3 -- ok
[80] $ quilt pop -R -- ok
[86] $ quilt add file4 -- ok
[89] $ echo "This is file 4." > file4 -- ok
[90] $ quilt refresh -- ok
[93] $ quilt push -- ok
[99] $ quilt new subdir/patch3.diff -- ok
[102] $ quilt add file4 -- ok
[105] $ rm -f file4 -- ok
[106] $ quilt diff -p ab -- ok
[114] $ quilt add -P patch2 file4 -- ok
[117] $ quilt refresh -- ok
[120] $ echo "Another line here, too." >> dir/file3 -- ok
[121] $ quilt refresh patch2 -- ok
[124] $ echo "Another line added." >> file2 -- ok
[125] $ quilt diff -z -P patch1 -p ab -- ok
[135] $ quilt refresh patch1 -- ok
[138] $ quilt refresh -f patch1 -- ok
[141] $ echo "Another line here, too." >> dir/file3 -- ok
[142] $ quilt pop -R -- ok
[148] $ quilt refresh patch2 -- ok
[151] $ quilt pop -qaR -- ok
44 commands (44 passed, 0 failed)
PASS: one
[test/perms.test]
[1] $ umask 022 -- ok
[2] $ mkdir patches -- ok
[4] $ echo foo > foo -- ok
[5] $ chmod 704 foo -- ok
[6] $ ls -l foo | awk '{ print substr($1, 1, 10), $NF }' -- ok
[9] $ quilt new test.diff -- ok
[12] $ quilt add foo -- ok
[15] $ ls -l foo | awk '{ print substr($1, 1, 10), $NF }' -- ok
[18] $ echo foobar > foo -- ok
[19] $ quilt refresh -- ok
[22] $ quilt new test2.diff -- ok
[25] $ quilt add foo -- ok
[28] $ chmod 702 foo -- ok
[29] $ ls -l foo | awk '{ print substr($1, 1, 10), $NF }' -- ok
[32] $ echo foobaz > foo -- ok
[33] $ quilt refresh -- ok
[40] $ quilt pop -q -- ok
[44] $ ls -l foo | awk '{ print substr($1, 1, 10), $NF }' -- ok
[47] $ quilt push -q -- ok
[51] $ ls -l foo | awk '{ print substr($1, 1, 10), $NF }' -- ok
[54] $ quilt pop -q -- ok
21 commands (21 passed, 0 failed)
PASS: perms
[test/project-settings.test]
[2] $ export QUILT_PATCHES=my_patches -- ok
[3] $ export QUILT_SERIES=my_series -- ok
[5] $ mkdir quilt_patches -- ok
[6] $ mkdir .pc -- ok
[7] $ echo 2 > .pc/.version -- ok
[8] $ echo quilt_patches > .pc/.quilt_patches -- ok
[9] $ echo quilt_series > .pc/.quilt_series -- ok
[10] $ echo create.patch > quilt_patches/quilt_series -- ok
[12] $ cat > quilt_patches/create.patch -- ok
[18] $ quilt push -- ok
10 commands (10 passed, 0 failed)
PASS: project-settings
[test/refresh-z.test]
[1] $ mkdir patches -- ok
[3] $ quilt new test.diff -- ok
[6] $ quilt add foo -- ok
[9] $ echo foo > foo -- ok
[10] $ quilt refresh -- ok
[13] $ echo bar >> foo -- ok
[14] $ quilt refresh -z -- ok
[17] $ echo baz >> foo -- ok
[18] $ quilt refresh -zbaz.diff -- ok
[21] $ quilt series -- ok
10 commands (10 passed, 0 failed)
PASS: refresh-z
[test/refresh.test]
[1] $ mkdir patches -- ok
[3] $ echo a > a -- ok
[4] $ echo b > b -- ok
[5] $ diff -u a b > patches/patch -- ok
[6] $ echo patch -p0 > patches/series -- ok
[7] $ rm -f b -- ok
[8] $ quilt push -q -- ok
[12] $ echo a > a -- ok
[13] $ quilt refresh -- ok
[15] $ quilt pop -- ok
[20] $ cat a -- ok
[22] $ cat patches/patch -- ok
12 commands (12 passed, 0 failed)
PASS: refresh
[test/refresh_patch_order.test]
[7] $ mkdir patches -- ok
[9] $ echo foo >foo -- ok
[10] $ echo fnord >fnord -- ok
[11] $ echo zulu >zulu -- ok
[13] $ quilt new bar -- ok
[17] $ quilt add fnord zulu -- ok
[21] $ echo x >>fnord -- ok
[22] $ echo x >>zulu -- ok
[23] $ quilt refresh --no-timestamps -p ab -- ok
[26] $ grep '^--- ' patches/bar -- ok
[31] $ quilt add foo -- ok
[34] $ echo x >>foo -- ok
[35] $ quilt refresh --no-timestamps -p ab -- ok
[38] $ grep '^--- ' patches/bar -- ok
[44] $ echo fnord >fnord -- ok
[46] $ quilt refresh --no-timestamps -p ab -- ok
[49] $ grep '^--- ' patches/bar -- ok
[54] $ echo x >>fnord -- ok
[56] $ quilt refresh --no-timestamps -p ab -- ok
[59] $ grep '^--- ' patches/bar -- ok
20 commands (20 passed, 0 failed)
PASS: refresh_patch_order
[test/remember-locations.test]
[1] $ mkdir -p my/changes -- ok
[3] $ export QUILT_PATCHES=my/changes -- ok
[4] $ export QUILT_SERIES=patchlist -- ok
[5] $ quilt new mychange1 -- ok
[7] $ unset QUILT_PATCHES -- ok
[8] $ unset QUILT_SERIES -- ok
[9] $ cat .pc/.quilt_patches -- ok
[11] $ cat .pc/.quilt_series -- ok
[13] $ cat my/changes/patchlist -- ok
[18] $ quilt new mychange2 -- ok
[22] $ cd my -- ok
[23] $ quilt applied -- ok
[27] $ cd .. -- ok
13 commands (13 passed, 0 failed)
PASS: remember-locations
[test/remove-trailing-ws.test]
[4] $ mkdir files.orig files -- ok
[6] $ cat > files.orig/add -- ok
[13] $ cat > files.orig/change -- ok
[17] $ cat > files.orig/complex -- ok
[32] $ cat > files.orig/delete -- ok
[36] $ cat > files.orig/remove -- ok
[45] $ cat > files.orig/remove-at-end -- ok
[61] $ cat > files/add -- ok
[70] $ cat > files/change -- ok
[74] $ cat > files/complex -- ok
[96] $ cat > files/create -- ok
[100] $ cat > files/remove -- ok
[107] $ cat > files/remove-at-end -- ok
[117] $ cp -r files files.backup -- ok
[120] $ diff -ruN files.orig files > unified.diff -- ok
[123] $ diff -c files.orig/add files/add > context.diff -- ok
[124] $ diff -C 10 files.orig/remove-at-end files/remove-at-end >> context.diff -- ok
[125] $ diff -cN files.orig/create files/create | sed -e '/^diff /d' >> context.diff -- ok
[126] $ diff -cN files.orig/delete files/delete >> context.diff -- ok
[127] $ diff -c files.orig/remove files/remove | sed -e '/^diff /d' >> context.diff -- ok
[128] $ diff -c files.orig/change files/change | sed -e '/^diff /d'  >> context.diff -- ok
[129] $ diff -c files.orig/complex files/complex >> context.diff -- ok
[131] $ /usr/share/quilt//scripts/remove-trailing-ws < unified.diff > unified-wsok.diff -- ok
[136] $ wc -l files/add -- ok
[138] $ wc -l files/change -- ok
[140] $ wc -l files/complex -- ok
[142] $ wc -l files/create -- ok
[144] $ wc -l files/remove -- ok
[146] $ wc -l files/remove-at-end -- ok
[148] $ wc -l unified.diff -- ok
[150] $ wc -l unified-wsok.diff -- ok
[152] $ diff -u unified.diff unified-wsok.diff | grep '^++[^+]' -- ok
[162] $ rm -rf files -- ok
[163] $ mv files.backup files -- ok
[164] $ /usr/share/quilt//scripts/remove-trailing-ws < context.diff > context-wsok.diff -- ok
[169] $ wc -l files/add -- ok
[171] $ wc -l files/change -- ok
[173] $ wc -l files/complex -- ok
[175] $ wc -l files/create -- ok
[177] $ wc -l files/remove -- ok
[179] $ wc -l files/remove-at-end -- ok
[181] $ wc -l context.diff -- ok
[183] $ wc -l context-wsok.diff -- ok
[185] $ diff -u context.diff context-wsok.diff | grep '^+[+!] ' -- ok
44 commands (44 passed, 0 failed)
PASS: remove-trailing-ws
[test/rename.test]
[1] $ mkdir patches -- ok
[3] $ cat > announce.txt -- ok
[6] $ quilt new original-name.diff -- ok
[9] $ quilt add announce.txt -- ok
[12] $ cat > announce.txt -- ok
[15] $ quilt refresh -- ok
[18] $ quilt series -v -- ok
[21] $ quilt rename _tmp_name.diff -- ok
[24] $ quilt series -v -- ok
[27] $ quilt pop -- ok
[33] $ quilt series -v -- ok
[36] $ quilt rename -P random_name.diff final.name.diff -- ok
[39] $ quilt rename final.name.diff -- ok
[42] $ quilt rename -P _tmp_name.diff _tmp_name.diff -- ok
[45] $ quilt rename -P _tmp_name.diff newsubdir/final.name.diff -- ok
[48] $ quilt series -v -- ok
[51] $ quilt push -q -- ok
[55] $ quilt pop -q -- ok
18 commands (18 passed, 0 failed)
PASS: rename
[test/revert.test]
[1] $ mkdir patches -- ok
[3] $ mkdir sub -- ok
[4] $ echo f1 > sub/f -- ok
[5] $ echo g1 > sub/g -- ok
[6] $ quilt new p.diff -- ok
[9] $ quilt add sub/f sub/g sub/h -- ok
[14] $ echo h1 > sub/h -- ok
[15] $ quilt revert sub/h -- ok
[18] $ quilt diff -z -- ok
[21] $ echo f2 > sub/f -- ok
[22] $ rm -f sub/g -- ok
[23] $ echo h2 > sub/h -- ok
[24] $ quilt refresh -- ok
[28] $ cd sub -- ok
[29] $ echo f3 > f -- ok
[30] $ echo h3 > h -- ok
[31] $ quilt revert f g h -- ok
[36] $ quilt diff -z -- ok
[39] $ echo g3 > g -- ok
[40] $ quilt revert f g -- ok
[44] $ quilt diff -z -- ok
[45] $ [ ! -e g ] || echo "File sub/g shouldn't exist" -- ok
[48] $ rm f h -- ok
[49] $ quilt revert f h -- ok
[53] $ quilt diff -z -- ok
[54] $ [ -e f ] || echo "File sub/f should exist" -- ok
[55] $ [ -e h ] || echo "File sub/h should exist" -- ok
27 commands (27 passed, 0 failed)
PASS: revert
[test/setup.test]
[1] $ mkdir dir -- ok
[3] $ echo 1 > dir/foo.orig -- ok
[4] $ echo 2 > dir/foo -- ok
[5] $ diff -u dir/foo.orig dir/foo > foo.diff -- ok
[6] $ diff -u dir/foo.orig dir/foo > revert.diff -- ok
[7] $ diff -u dir/foo.orig dir/foo > again.diff -- ok
[8] $ mv dir/foo.orig dir/foo -- ok
[9] $ tar cf - dir | gzip > dir.tar.gz -- ok
[10] $ mkdir dir/patches -- ok
[11] $ echo crap > dir/patches/foo.diff -- ok
[12] $ tar cf - dir | gzip > dir_with_patches.tar.gz -- ok
[13] $ rm -rf dir -- ok
[15] $ cat > series -- ok
[22] $ quilt setup series -- ok
[24] $ cd dir -- ok
[25] $ ls -l patches series | sed -e 's:.* -> ::' -- ok
[28] $ quilt push -qa -- ok
[33] $ cd .. -- ok
[34] $ rm -rf dir -- ok
[37] $ mkdir .pc patches -- ok
[38] $ quilt setup series -- ok
[40] $ rm -rf dir .pc patches -- ok
[42] $ quilt setup -d other series -- ok
[44] $ cd other/dir -- ok
[45] $ ls -l patches series | sed -e 's:.* -> ::' -- ok
[48] $ quilt push -qa -- ok
[53] $ cd ../.. -- ok
[54] $ rm -rf other -- ok
[55] $ mkdir dir1 -- ok
[56] $ mv series dir1 -- ok
[57] $ cd dir1 -- ok
[58] $ quilt setup -d ../other series -- ok
[60] $ quilt setup --sourcedir .. -d ../other series -- ok
[62] $ cd ../other/dir -- ok
[63] $ ls -l patches series | sed -e 's:.* -> ::' -- ok
[66] $ quilt push -qa -- ok
[71] $ cd ../.. -- ok
[72] $ rm -rf "dir" -- ok
[76] $ cat > series_with_patches -- ok
[81] $ mkdir dir -- ok
[82] $ quilt setup series_with_patches -- ok
[84] $ rmdir dir -- ok
[85] $ quilt setup series_with_patches -- ok
[89] $ cd dir -- ok
[90] $ ls -l quilt_patches quilt_series | sed -e 's:.* -> ::' -- ok
[93] $ quilt push -qa -- ok
[96] $ cd .. -- ok
[97] $ rm -rf "dir" -- ok
[100] $ mkdir "space [dir]" -- ok
[101] $ echo 1 > "space [dir]/foo.orig" -- ok
[102] $ echo 2 > "space [dir]/foo" -- ok
[105] $ diff -u "space [dir]/foo.orig" "space [dir]/foo" | sed -e 's:"::g' > foo.diff -- ok
[106] $ cp foo.diff revert.diff -- ok
[107] $ cp foo.diff again.diff -- ok
[108] $ mv "space [dir]/foo.orig" "space [dir]/foo" -- ok
[109] $ tar cf - "space [dir]" | gzip > "space [dir].tar.gz" -- ok
[110] $ rm -rf "space [dir]" -- ok
[111] $ cat > series -- ok
[118] $ quilt setup series -- ok
[120] $ cd space\ [dir] -- ok
[121] $ ls -l patches series | sed -e 's:.* -> ::' -- ok
[124] $ quilt push -qa -- ok
[129] $ cd .. -- ok
[130] $ rm -rf "space [dir]" -- ok
64 commands (64 passed, 0 failed)
PASS: setup
[test/snapshot.test]
[1] $ mkdir patches -- ok
[3] $ quilt new snapshot -- ok
[5] $ quilt add f.txt -- ok
[7] $ cat > f.txt -- ok
[10] $ quilt add g.txt -- ok
[12] $ cat > g.txt -- ok
[15] $ quilt refresh -- ok
[17] $ quilt snapshot -- ok
[19] $ quilt fork -- ok
[22] $ rm g.txt -- ok
[23] $ quilt add h.txt -- ok
[26] $ cat > h.txt -- ok
[29] $ cat >> f.txt -- ok
[32] $ quilt refresh -- ok
[35] $ quilt diff --snapshot | grep -v "^\\(---\\|+++\\)" -- ok
15 commands (15 passed, 0 failed)
PASS: snapshot
[test/snapshot2.test]
[1] $ mkdir patches d -- ok
[3] $ quilt new snapshot -- ok
[6] $ cd d -- ok
[7] $ quilt add f.txt -- ok
[9] $ cat > f.txt -- ok
[12] $ quilt add g.txt -- ok
[14] $ cat > g.txt -- ok
[17] $ quilt refresh -- ok
[19] $ quilt snapshot -- ok
[20] $ quilt fork -- ok
[23] $ rm g.txt -- ok
[24] $ quilt add h.txt -- ok
[27] $ cat > h.txt -- ok
[30] $ cat >> f.txt -- ok
[33] $ quilt refresh -- ok
[36] $ quilt diff --snapshot | grep -v "^\\(---\\|+++\\)" -- ok
16 commands (16 passed, 0 failed)
PASS: snapshot2
[test/sort.test]
[1] $ mkdir patches -- ok
[3] $ quilt new sort.diff -- ok
[6] $ quilt add b f -- ok
[10] $ echo b > b -- ok
[11] $ echo f > f -- ok
[12] $ quilt refresh -- ok
[15] $ quilt add c -- ok
[18] $ echo c > c -- ok
[19] $ quilt refresh -- ok
[22] $ quilt files -- ok
[27] $ quilt diff | grep '^Index' -- ok
[32] $ quilt add z x -- ok
[36] $ echo z > z -- ok
[37] $ echo x > x -- ok
[38] $ quilt files -- ok
[45] $ quilt diff | grep '^Index' -- ok
[52] $ quilt add a -- ok
[55] $ echo a > a -- ok
[56] $ quilt files -- ok
[64] $ quilt diff | grep '^Index' -- ok
[72] $ quilt refresh -- ok
[75] $ grep '^Index' patches/sort.diff -- ok
[83] $ quilt diff --sort | grep '^Index' -- ok
[91] $ quilt refresh --sort -- ok
[94] $ grep '^Index' patches/sort.diff -- ok
25 commands (25 passed, 0 failed)
PASS: sort
[test/space-in-filenames.test]
[1] $ mkdir patches -- ok
[3] $ quilt new test.diff -- ok
[6] $ echo foo > foo -- ok
[7] $ quilt add foo -- ok
[10] $ quilt files -- ok
[12] $ quilt patches foo -- ok
[14] $ quilt patches "foo bar" -- ok
[16] $ echo foo > "foo bar" -- ok
[17] $ quilt add "foo bar" -- ok
[20] $ quilt files -- ok
[23] $ quilt patches "foo bar" -- ok
[25] $ quilt patches bar -- ok
[26] $ quilt patches "foo bar baz" -- ok
[28] $ quilt add "a: b [c]" -- ok
[31] $ quilt files -- ok
[35] $ quilt patches 'a: b [c]' -- ok
[37] $ quilt patches a -- ok
[38] $ quilt patches b -- ok
[39] $ quilt patches 'a: b c' -- ok
[41] $ echo bar > "foo bar" -- ok
[42] $ echo "new line" > "a: b [c]" -- ok
[43] $ quilt diff -p ab -- ok
[58] $ quilt refresh -p ab -- ok
[60] $ cat patches/test.diff -- ok
[75] $ quilt refresh -p ab --sort -- ok
[77] $ cat patches/test.diff -- ok
[92] $ quilt grep bar -- ok
[94] $ quilt grep new -- ok
[96] $ quilt grep " " -- ok
[99] $ quilt remove "a: b [c]" -- ok
[102] $ quilt files -- ok
[106] $ quilt remove "foo bar" -- ok
[109] $ quilt files -- ok
33 commands (33 passed, 0 failed)
PASS: space-in-filenames
[test/space-in-series.test]
[4] $ export QUILT_SERIES="quilt series" -- ok
[9] $ mkdir patches -- ok
[11] $ cat > Oberon.txt -- ok
[17] $ quilt new flower.diff -- ok
[20] $ quilt files -- ok
[21] $ quilt add Oberon.txt -- ok
[24] $ cat >> Oberon.txt -- ok
[31] $ quilt refresh -p ab -- ok
[34] $ cat patches/flower.diff -- ok
[47] $ sed -ne '1,4p' Oberon.txt > Oberon.new -- ok
[48] $ echo "Fetch me that flower; the herb I shew'd thee once:" >> Oberon.new -- ok
[49] $ sed -e '1,4d' Oberon.txt >> Oberon.new -- ok
[50] $ mv Oberon.new Oberon.txt -- ok
[51] $ quilt diff -z -p ab -- ok
[65] $ quilt diff -p ab -- ok
[79] $ quilt refresh -- ok
[82] $ quilt top -- ok
[85] $ quilt files -- ok
[88] $ quilt patches Oberon.txt -- ok
[90] $ quilt pop -f -- ok
[96] $ quilt files patches/flower.diff -- ok
[99] $ sed -e "s/girls/maidens/" Oberon.txt > Oberon.new -- ok
[100] $ mv Oberon.new Oberon.txt -- ok
[101] $ quilt push -- ok
[108] $ quilt push -f -- ok
[115] $ cat >> Oberon.txt -- ok
[121] $ quilt refresh -p ab -- ok
[123] $ rm -f Oberon.txt.rej -- ok
[125] $ cat Oberon.txt -- ok
[135] $ cat patches/flower.diff -- ok
[149] $ quilt grep love -- ok
31 commands (31 passed, 0 failed)
PASS: space-in-series
[test/space-in-work-dir.test]
[1] $ mkdir "work dir" -- ok
[2] $ cd "work dir" -- ok
[4] $ mkdir project -- ok
[5] $ cd project -- ok
[7] $ mkdir patches -- ok
[8] $ mkdir subdir -- ok
[10] $ echo old > a -- ok
[11] $ quilt new 1.patch -- ok
[14] $ quilt add a -- ok
[17] $ echo new > a -- ok
[18] $ quilt refresh -- ok
[21] $ cat patches/1.patch -- ok
[30] $ echo newer > a -- ok
[31] $ quilt diff -z -- ok
[40] $ quilt revert a -- ok
[42] $ quilt diff -z -- ok
[43] $ echo newer > a -- ok
[45] $ quilt refresh -z -- ok
[47] $ quilt series -- ok
[50] $ cat patches/1.patch -- ok
[58] $ cat patches/1-2.patch -- ok
[69] $ cd subdir -- ok
[70] $ quilt pop -q -- ok
[73] $ quilt diff --no-index -- ok
[79] $ cd .. -- ok
[81] $ quilt pop -- ok
[87] $ quilt push -- ok
[93] $ quilt top -- ok
[96] $ quilt series -v -- ok
[100] $ quilt fold < patches/1-2.patch -- ok
[103] $ quilt diff -z -- ok
[112] $ quilt refresh -- ok
[115] $ quilt delete -rn -- ok
[118] $ quilt remove a -- ok
34 commands (34 passed, 0 failed)
PASS: space-in-work-dir
[test/subdir.test]
[1] $ mkdir patches -- ok
[3] $ mkdir subdir -- ok
[4] $ cat > subdir/file -- ok
[7] $ quilt new test.patch -- ok
[10] $ quilt add subdir/file -- ok
[13] $ cat > subdir/file -- ok
[18] $ quilt refresh -- ok
[21] $ cd subdir -- ok
[22] $ quilt add file2 -- ok
[25] $ cat > file2 -- ok
[28] $ cat > file3 -- ok
[31] $ quilt add file3 -- ok
[34] $ rm -f file3 -- ok
[35] $ quilt files -v -- ok
[40] $ quilt diff -p ab -- ok
[62] $ quilt diff --no-index -p ab file file2 no -- ok
[74] $ quilt diff --no-index -p ab ./file3 ./no -- ok
[80] $ quilt refresh -- ok
18 commands (18 passed, 0 failed)
PASS: subdir
[test/symlink.test]
[1] $ mkdir patches -- ok
[4] $ echo foo > foo -- ok
[5] $ quilt new test.diff -- ok
[8] $ quilt add foo -- ok
[11] $ echo "foo changed" > foo -- ok
[12] $ quilt refresh -- ok
[16] $ mv patches/test.diff . -- ok
[17] $ ln -s ../test.diff patches/test.diff -- ok
[18] $ readlink patches/test.diff -- ok
[22] $ echo "foo changed 2" > foo -- ok
[23] $ quilt refresh --no-index -p ab -- ok
[26] $ readlink patches/test.diff -- ok
[30] $ echo "foo changed 3" > foo -- ok
[31] $ touch -r patches/test.diff test.timeref -- ok
[32] $ quilt refresh --backup --no-index -p ab -- ok
[35] $ readlink patches/test.diff -- ok
[38] $ cat patches/test.diff -- ok
[45] $ readlink patches/test.diff~ -- ok
[46] $ echo 1 -- ok
[49] $ cat patches/test.diff~ -- ok
[56] $ [ patches/test.diff~ -nt test.timeref ] && echo "mtimes differ" -- ok
[59] $ quilt header -a -- ok
[63] $ readlink patches/test.diff -- ok
[67] $ touch -r patches/test.diff test.timeref -- ok
[68] $ quilt header -r --backup -- ok
[71] $ readlink patches/test.diff -- ok
[74] $ cat patches/test.diff -- ok
[81] $ readlink patches/test.diff~ -- ok
[82] $ echo 1 -- ok
[85] $ cat patches/test.diff~ -- ok
[93] $ [ patches/test.diff~ -nt test.timeref ] && echo "mtimes differ" -- ok
[96] $ chmod -w test.diff -- ok
[97] $ echo "foo changed 4" > foo -- ok
[98] $ quilt refresh --no-index -p ab -- ok
[101] $ readlink patches/test.diff -- ok
[102] $ echo 1 -- ok
[105] $ cat patches/test.diff -- ok
[113] $ rm -f test.diff -- ok
[114] $ mv patches/test.diff . -- ok
[115] $ ln -s ../test.diff patches/test.diff -- ok
[116] $ chmod -w test.diff -- ok
[118] $ echo "foo changed 5" > foo -- ok
[119] $ quilt refresh --backup --no-index -p ab -- ok
[122] $ readlink patches/test.diff -- ok
[123] $ echo 1 -- ok
[126] $ cat patches/test.diff -- ok
[133] $ readlink patches/test.diff~ -- ok
[134] $ echo 1 -- ok
[137] $ cat patches/test.diff~ -- ok
49 commands (49 passed, 0 failed)
PASS: symlink
[test/tester.test]
[4] $ echo  -- ok
[6] $ export VAR=foo -- ok
[7] $ echo foo -- ok
[9] $ export VAR=bar -- ok
[10] $ echo bar -- ok
[14] $ true -- ok
[15] $ echo bar -- ok
[19] $ echo "A barbarian walks into a bar" -- ok
[23] $ export PLACE=barracks -- ok
[24] $ echo barracks -- ok
10 commands (10 passed, 0 failed)
PASS: tester
[test/three.test]
[1] $ mkdir patches -- ok
[3] $ quilt new patch1.diff -- ok
[6] $ quilt top -- ok
[9] $ quilt add f -- ok
[12] $ echo f > f -- ok
[14] $ ls patches/ -- ok
[17] $ quilt new patch2.diff -- ok
[20] $ quilt previous -- ok
[23] $ quilt add g -- ok
[26] $ echo g > g -- ok
[28] $ quilt refresh -- ok
[32] $ quilt diff -p0 f g -- ok
[41] $ quilt diff -p0 ./f ./g -- ok
[49] $ quilt pop -- ok
[55] $ ls patches/ -- ok
[59] $ quilt next -- ok
[62] $ quilt previous -- ok
[63] $ quilt previous patch2 -- ok
[66] $ quilt pop -- ok
[69] $ quilt refresh -- ok
[72] $ quilt refresh patch2 -- ok
[75] $ quilt pop -- ok
[81] $ quilt top -- ok
[84] $ quilt pop -- ok
[86] $ echo 2 -- ok
[89] $ quilt applied -- ok
[92] $ quilt unapplied -- ok
[96] $ quilt previous -- ok
[99] $ quilt next -- ok
[102] $ quilt applied patch1 -- ok
[105] $ quilt unapplied patch2 -- ok
[106] $ quilt unapplied patch1 -- ok
[109] $ quilt revert f -- ok
[112] $ quilt delete patch3.diff -- ok
[115] $ quilt push -qa -- ok
[120] $ quilt push patch2 -- ok
[123] $ quilt push -- ok
[125] $ echo 2 -- ok
[128] $ quilt diff --combine patch1 -P patch2 -p ab -- ok
[142] $ quilt diff -P patch1 --combine patch2 -- ok
[145] $ echo patch3.diff >> patches/series -- ok
[146] $ quilt diff -P patch1 --combine patch3 -- ok
[149] $ quilt pop -qaR -- ok
[154] $ quilt annotate f -- ok
[157] $ quilt pop patch4.diff -- ok
[160] $ quilt grep "not there" -- ok
[162] $ quilt push -q 2 -- ok
[167] $ quilt pop -q 2 -- ok
[172] $ quilt push -q 10 -- ok
[179] $ quilt pop -q 10 -- ok
[185] $ quilt push 0 -- ok
[187] $ echo 2 -- ok
[190] $ quilt pop 0 -- ok
[192] $ echo 2 -- ok
54 commands (54 passed, 0 failed)
PASS: three
[test/timestamps.test]
[3] $ mkdir patches -- ok
[5] $ cat > patches/series -- ok
[13] $ cat > patches/unified-create.patch -- ok
[20] $ cat > patches/unified-update.patch -- ok
[28] $ cat > patches/unified-delete.patch -- ok
[35] $ cat > patches/context-create.patch -- ok
[43] $ cat > patches/context-update.patch -- ok
[52] $ cat > patches/context-delete.patch -- ok
[61] $ quilt patches file -- ok
[70] $ quilt patches 1 -- ok
[72] $ quilt push -qa -- ok
[82] $ quilt patches file -- ok
12 commands (12 passed, 0 failed)
PASS: timestamps
[test/trailing-ws.test]
[1] $ mkdir patches -- ok
[3] $ cat > a -- ok
[8] $ quilt new test.diff -- ok
[11] $ quilt add a -- ok
[14] $ cat > a -- ok
[19] $ quilt refresh -- ok
[23] $ grep '[ \t]$' patches/test.diff -- ok
[27] $ quilt refresh -U0 -- ok
[31] $ quilt refresh --strip-trailing-whitespace -- ok
[35] $ grep '[ \t]$' patches/test.diff -- ok
[37] $ quilt pop -q -- ok
[41] $ cat > a -- ok
[46] $ quilt new test2.diff -- ok
[49] $ quilt add a -- ok
[52] $ cat > a -- ok
[57] $ quilt refresh -c -- ok
[61] $ grep '[ \t]$' patches/test2.diff -- ok
[65] $ quilt refresh -C0 -- ok
[69] $ quilt refresh -c --strip-trailing-whitespace -- ok
[73] $ grep '[ \t]$' patches/test2.diff -- ok
[75] $ quilt pop -q -- ok
21 commands (21 passed, 0 failed)
PASS: trailing-ws
[test/two.test]
[1] $ mkdir patches d -- ok
[3] $ quilt new patch1.diff -- ok
[6] $ cd d -- ok
[7] $ mkdir dir -- ok
[8] $ echo "This is file one." > dir/file1 -- ok
[9] $ quilt add dir/file1 -- ok
[12] $ quilt add file2 -- ok
[15] $ quilt diff -- ok
[16] $ quilt diff -z -- ok
[17] $ quilt refresh -- ok
[20] $ echo "This is file two." > file2 -- ok
[21] $ quilt diff -p ab -- ok
[29] $ quilt diff -z -p ab -- ok
[37] $ quilt refresh -- ok
[40] $ quilt diff -z -- ok
[41] $ echo "Another line has been added." >> dir/file1 -- ok
[42] $ quilt diff -z -p ab -- ok
[51] $ cd dir -- ok
[52] $ quilt diff -z file1 -p ab -- ok
[61] $ cd .. -- ok
[63] $ quilt refresh -- ok
[66] $ cd .. -- ok
[67] $ quilt new patch2.diff -- ok
[70] $ cd d -- ok
[71] $ quilt add dir/file3 -- ok
[74] $ echo "This is file three." > dir/file3 -- ok
[75] $ quilt refresh -- ok
[78] $ quilt add -P patch1 dir/file3 -- ok
[81] $ quilt pop -R -- ok
[87] $ quilt add file4 -- ok
[90] $ echo "This is file 4." > file4 -- ok
[91] $ quilt refresh -- ok
[94] $ quilt push -- ok
[100] $ cd .. -- ok
[101] $ quilt new subdir/patch3.diff -- ok
[104] $ cd d -- ok
[105] $ quilt add file4 -- ok
[108] $ rm -f file4 -- ok
[109] $ quilt diff -p ab -- ok
[117] $ quilt add -P patch2 file4 -- ok
[120] $ quilt refresh -- ok
[123] $ echo "Another line here, too." >> dir/file3 -- ok
[124] $ quilt refresh patch2 -- ok
[127] $ echo "Another line added." >> file2 -- ok
[128] $ quilt diff -z -P patch1 -p ab -- ok
[138] $ quilt refresh patch1 -- ok
[141] $ quilt refresh -f patch1 -- ok
[144] $ echo "Another line here, too." >> dir/file3 -- ok
[145] $ quilt pop -R -- ok
[151] $ quilt refresh patch2 -- ok
[154] $ quilt grep -- two -- ok
[157] $ quilt pop -qaR -- ok
[162] $ quilt patches file4 -- ok
[166] $ quilt push -qa -- ok
[172] $ quilt patches file4 -- ok
[176] $ quilt pop -q patch2.diff -- ok
[180] $ quilt patches -v dir/file3 file4 -- ok
57 commands (57 passed, 0 failed)
PASS: two
DURATION: 46