blob: 72c38d077f546c7725ca031d9bf200b6324b378b (
plain) (
blame)
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
|
# same as import.test, but with compressed patches
$ mkdir patches
$ quilt new patch1.diff
> Patch %{P}patch1.diff is now on top
$ quilt add f
> File f added to patch %{P}patch1.diff
$ echo f > f
$ quilt refresh
> Refreshed patch %{P}patch1.diff
$ quilt pop
> Removing patch %{P}patch1.diff
> Removing f
>
> No patches applied
$ mkdir t
$ gzip < patches/patch1.diff > t/patch1.diff.gz
$ rm -f patches/patch1.diff
# test importing into an empty series
$ rm -rf patches/ %{QUILT_PC}/
$ mkdir patches
$ quilt import t/patch1.diff.gz
> Importing patch t/patch1.diff.gz (stored as %{P}patch1.diff.gz)
$ quilt push
> Applying patch %{P}patch1.diff.gz
>~ patching file `?f'?
>
> Now at patch %{P}patch1.diff.gz
$ quilt new patch2.diff.gz
> Patch %{P}patch2.diff.gz is now on top
$ quilt add g
> File g added to patch %{P}patch2.diff.gz
$ echo g > g
$ quilt refresh
> Refreshed patch %{P}patch2.diff.gz
$ quilt pop
> Removing patch %{P}patch2.diff.gz
> Removing g
>
> Now at patch %{P}patch1.diff.gz
$ quilt header -a
< original description
> Appended text to header of patch %{P}patch1.diff.gz
$ quilt pop
> Removing patch %{P}patch1.diff.gz
> Removing f
>
> No patches applied
$ quilt delete patch1
> Removed patch %{P}patch1.diff.gz
$ cat patches/series
> patch2.diff.gz
# test a few error cases
$ quilt import missing.diff.gz
> Patch missing.diff.gz does not exist
$ quilt import patches/patch1.diff.gz
> Importing patch %{P}patch1.diff.gz
$ quilt import patches/patch2.diff.gz
> Patch %{P}patch2.diff.gz already exists in series.
# a simple use of import
$ quilt import t/patch1.diff.gz
> Patch %{P}patch1.diff.gz exists. Replace with -f.
$ quilt import -f t/patch1.diff.gz
> Replacing patch %{P}patch1.diff.gz with new version
# an import requiring a description merge
$ zcat patches/patch1.diff.gz | sed -e 's/original/new/' | gzip > t/patch1.diff.gz
$ quilt import t/patch1.diff.gz
> Patch %{P}patch1.diff.gz exists. Replace with -f.
$ quilt import -f t/patch1.diff.gz
> Patch headers differ:
> @@ -1 +1 @@
> -original description
> +new description
> Please use -d {o|a|n} to specify which patch header(s) to keep.
$ quilt import -d a -f t/patch1.diff.gz
> Replacing patch %{P}patch1.diff.gz with new version
# quilt header does not work in this case because it stops at '---'
$ zcat patches/patch1.diff.gz | head -n 3
> original description
> ---
> new description
$ quilt import -d n -f t/patch1.diff.gz
> Replacing patch %{P}patch1.diff.gz with new version
$ quilt header patch1
> new description
$ quilt delete patch1
> Removed patch %{P}patch1.diff.gz
# make sure it accepts non-conflicting names
# a small presentation problem here
$ cp patches/patch1.diff.gz t/patch1.patch.gz
$ quilt import t/patch1.patch.gz
> Importing patch t/patch1.patch.gz (stored as %{P}patch1.patch.gz)
$ ls patches/
> patch1.diff.gz
> patch1.patch.gz
> patch2.diff.gz
> series
$ cat patches/series
> patch1.patch.gz
> patch2.diff.gz
$ quilt delete patch1.diff.gz
> Patch patch1.diff.gz is not in series
|
