blob: 364506f801f161b859cc007cd6654f0c2882ba8e (
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
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
|
$ mkdir patches
$ touch e
$ quilt annotate e
> No series file found
$ quilt top
> No series file found
$ quilt next
> No series file found
$ quilt previous
> No series file found
$ quilt unapplied
> No series file found
$ quilt applied
> No series file found
$ quilt next patch1
> No series file found
$ quilt push patch1
> No series file found
$ quilt push
> No series file found
$ quilt pop
> No patch removed
$ echo %{?}
> 2
$ quilt new patch1.diff
> Patch %{P}patch1.diff is now on top
$ quilt top
> patches/patch1.diff
$ quilt add f
> File f added to patch %{P}patch1.diff
$ echo f > f
$ ls patches/
> series
$ quilt new patch2.diff
> Patch %{P}patch2.diff is now on top
$ quilt previous
> patches/patch1.diff
$ quilt add g
> File g added to patch %{P}patch2.diff
$ echo g > g
$ quilt refresh
> Refreshed patch %{P}patch2.diff
# Test diff called with multiple file names
$ quilt diff -p0 f g
> Index: g
> ===================================================================
> --- /dev/null
> +++ g
> @@ -0,0 +1 @@
> +g
# Test that diff strips the "./" prefix
$ quilt diff -p0 ./f ./g
> Index: g
> ===================================================================
> --- /dev/null
> +++ g
> @@ -0,0 +1 @@
> +g
$ quilt pop
> Removing patch patches/patch2.diff
> Removing g
>
> Now at patch patches/patch1.diff
$ ls patches/
> patch2.diff
> series
$ quilt next
> patches/patch2.diff
$ quilt previous
$ quilt previous patch2
> patches/patch1.diff
$ quilt pop
> Patch %{P}patch1.diff does not remove cleanly (refresh it or enforce with -f)
$ quilt refresh
> Refreshed patch %{P}patch1.diff
$ quilt refresh patch2
> Patch patches/patch2.diff is not applied
$ quilt pop
> Removing patch patches/patch1.diff
> Removing f
>
> No patches applied
$ quilt top
> No patches applied
$ quilt pop
> No patch removed
$ echo %{?}
> 2
$ quilt applied
> No patches applied
$ quilt unapplied
> patches/patch1.diff
> patches/patch2.diff
$ quilt previous
> No patches applied
$ quilt next
> patches/patch1.diff
$ quilt applied patch1
> Patch patches/patch1.diff is not applied
$ quilt unapplied patch2
$ quilt unapplied patch1
> patches/patch2.diff
$ quilt revert f
> No patches applied
$ quilt delete patch3.diff
> Patch patch3.diff is not in series
$ quilt push -qa
> Applying patch patches/patch1.diff
> Applying patch patches/patch2.diff
> Now at patch patches/patch2.diff
$ quilt push patch2
> Patch patches/patch2.diff is currently applied
$ quilt push
> File series fully applied, ends at patch patches/patch2.diff
$ echo %{?}
> 2
$ quilt diff --combine patch1 -P patch2 -p ab
> Index: b/f
> ===================================================================
> --- /dev/null
> +++ b/f
> @@ -0,0 +1 @@
> +f
> Index: b/g
> ===================================================================
> --- /dev/null
> +++ b/g
> @@ -0,0 +1 @@
> +g
$ quilt diff -P patch1 --combine patch2
> Patch patches/patch2.diff not applied before patch patches/patch1.diff
$ echo patch3.diff >> patches/series
$ quilt diff -P patch1 --combine patch3
> Patch patches/patch3.diff is not applied
$ quilt pop -qaR
> Removing patch %{P}patch2.diff
> Removing patch %{P}patch1.diff
> No patches applied
$ quilt annotate f
> No patches applied
$ quilt pop patch4.diff
> Patch patch4.diff is not in series
$ quilt grep "not there"
$ quilt push -q 2
> Applying patch patches/patch1.diff
> Applying patch patches/patch2.diff
> Now at patch patches/patch2.diff
$ quilt pop -q 2
> Removing patch patches/patch2.diff
> Removing patch patches/patch1.diff
> No patches applied
$ quilt push -q 10
> Applying patch patches/patch1.diff
> Applying patch patches/patch2.diff
> Applying patch patches/patch3.diff
> Patch patches/patch3.diff does not exist; applied empty patch
> Now at patch patches/patch3.diff
$ quilt pop -q 10
> Patch patches/patch3.diff appears to be empty, removing
> Removing patch patches/patch2.diff
> Removing patch patches/patch1.diff
> No patches applied
$ quilt push 0
> No patch applied
$ echo %{?}
> 2
$ quilt pop 0
> No patch removed
$ echo %{?}
> 2
|
