blob: cfed8062729cd43cef50847949141483ac186db4 (
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
|
$ rm -rf d
$ mkdir -p d/patches
$ cd d
$ echo a > test.txt
$ echo d > test3.txt
$ cat > patches/ab.diff
< --- a/test.txt
< +++ b/test.txt
< @@ -1 +1 @@
< -a
< +b
< --- /dev/null
< +++ b/test2.txt
< @@ -0,0 +1 @@
< +c
< --- a/test3.txt
< +++ /dev/null
< @@ -1 +0,0 @@
< -d
$ echo "ab.diff -pab" > patches/series
$ quilt series
> patches/ab.diff
$ quilt push -q
> Applying patch patches/ab.diff
> Now at patch patches/ab.diff
$ quilt diff --no-index
> --- a/test.txt
> +++ b/test.txt
> @@ -1 +1 @@
> -a
> +b
> --- /dev/null
> +++ b/test2.txt
> @@ -0,0 +1 @@
> +c
> --- a/test3.txt
> +++ /dev/null
> @@ -1 +0,0 @@
> -d
$ rm patches/ab.diff
$ quilt refresh --no-index
> Refreshed patch patches/ab.diff
$ cat patches/ab.diff
> --- a/test.txt
> +++ b/test.txt
> @@ -1 +1 @@
> -a
> +b
> --- /dev/null
> +++ b/test2.txt
> @@ -0,0 +1 @@
> +c
> --- a/test3.txt
> +++ /dev/null
> @@ -1 +0,0 @@
> -d
$ quilt pop -qR
> Removing patch patches/ab.diff
> No patches applied
$ echo "ab.diff" > patches/series
$ quilt push -q
> Applying patch patches/ab.diff
> Now at patch patches/ab.diff
$ quilt diff -p ab --no-index
> --- a/test.txt
> +++ b/test.txt
> @@ -1 +1 @@
> -a
> +b
> --- /dev/null
> +++ b/test2.txt
> @@ -0,0 +1 @@
> +c
> --- a/test3.txt
> +++ /dev/null
> @@ -1 +0,0 @@
> -d
$ rm patches/ab.diff
$ quilt refresh -p ab --no-index
> Refreshed patch patches/ab.diff
$ cat patches/ab.diff
> --- a/test.txt
> +++ b/test.txt
> @@ -1 +1 @@
> -a
> +b
> --- /dev/null
> +++ b/test2.txt
> @@ -0,0 +1 @@
> +c
> --- a/test3.txt
> +++ /dev/null
> @@ -1 +0,0 @@
> -d
$ quilt refresh -p ab --diffstat
> Refreshed patch patches/ab.diff
$ sed -n -e 's/ *//' -e 's/ *|.*//p' patches/ab.diff
> test.txt
> test2.txt
> test3.txt
$ quilt pop -qR
> Removing patch patches/ab.diff
> No patches applied
$ cd ..
$ rm -rf d
|
