blob: b0aeb906fbb342b1b98873628d1321d1fc70fcf5 (
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
|
$ mkdir d
$ cd d
$ mkdir patches
$ cat > patches/series
< patch1.diff
< patch2.diff
$ cat > patches/patch1.diff
< --- q.orig/file1.txt
< +++ q/file1.txt
< @@ -0,0 +1 @@
< +This is file1.txt.
< --- q.orig/file2.txt
< +++ q/file2.txt
< @@ -0,0 +1 @@
< +This is file2.txt.
$ cat > patches/patch2.diff
< --- q.orig/file2.txt
< +++ q/file2.txt
< @@ -1 +0,0 @@
< -This is file2.txt.
< --- q.orig/file3.txt
< +++ q/file3.txt
< @@ -0,0 +1 @@
< +This is file3.txt.
$ quilt push -q
> Applying patch1
> Now at patch patch1
$ quilt files
> file1.txt
> file2.txt
$ quilt fold -q < patches/patch2.diff
$ quilt files
> file1.txt
> file3.txt
$ quilt diff | sed -e "s/\\t.*//"
> Index: d/file1.txt
> ===================================================================
> --- d.orig/file1.txt
> +++ d/file1.txt
> @@ -0,0 +1 @@
> +This is file1.txt.
> Index: d/file3.txt
> ===================================================================
> --- d.orig/file3.txt
> +++ d/file3.txt
> @@ -0,0 +1 @@
> +This is file3.txt.
$ cd ..
$ rm -rf d
|
