blob: 7e5724d95be648d2d9c0c11002f386c1f62af89c (
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
|
# Check that quilt properly deals with patches which delete vs. empty files
# Prepare the working tree
$ mkdir patches
$ echo "will be deleted" > deleted1
$ echo "will be emptied" > emptied1
$ echo "will be deleted" > deleted2
$ echo "will be emptied" > emptied2
# Prepate the patches and series
$ cat > patches/series
< using-filenames.patch
< using-timestamps.patch
$ cat > patches/using-filenames.patch
< diff -ruN a/deleted1 b/deleted1
< --- a/deleted1
< +++ /dev/null
< @@ -1 +0,0 @@
< -will be deleted
< diff -ruN a/emptied1 b/emptied1
< --- a/emptied1
< +++ b/emptied1
< @@ -1 +0,0 @@
< -will be emptied
$ cat > patches/using-timestamps.patch
< diff -ruN a/deleted2 b/deleted2
< --- a/deleted2 2014-01-15 11:19:43.000000000 +0100
< +++ b/deleted2 1970-01-01 01:00:00.000000000 +0100
< @@ -1 +0,0 @@
< -will be deleted
< diff -ruN a/emptied2 b/emptied2
< --- a/emptied2 2014-01-15 11:19:59.000000000 +0100
< +++ b/emptied2 2014-01-15 11:20:11.000000000 +0100
< @@ -1 +0,0 @@
< -will be emptied
# Test quilt push
$ quilt push
> Applying patch %{P}using-filenames.patch
> patching file deleted1
> patching file emptied1
>
> Now at patch %{P}using-filenames.patch
$ [ ! -e deleted1 ] && echo "File deleted1 does not exist"
> File deleted1 does not exist
$ [ -e deleted1 -a ! -s deleted1 ] && echo "File deleted1 is empty"
$ [ ! -e emptied1 ] && echo "File emptied1 does not exist"
$ [ -e emptied1 -a ! -s emptied1 ] && echo "File emptied1 is empty"
> File emptied1 is empty
$ quilt push
> Applying patch %{P}using-timestamps.patch
> patching file deleted2
> patching file emptied2
>
> Now at patch %{P}using-timestamps.patch
$ [ ! -e deleted2 ] && echo "File deleted2 does not exist"
> File deleted2 does not exist
$ [ -e deleted2 -a ! -s deleted2 ] && echo "File deleted2 is empty"
$ [ ! -e emptied2 ] && echo "File emptied2 does not exist"
$ [ -e emptied2 -a ! -s emptied2 ] && echo "File emptied2 is empty"
> File emptied2 is empty
# Test quilt fold
$ quilt pop -aq
> Removing patch %{P}using-timestamps.patch
> Removing patch %{P}using-filenames.patch
> No patches applied
$ quilt new fold.patch
> Patch %{P}fold.patch is now on top
$ quilt fold < patches/using-filenames.patch
> patching file deleted1
> patching file emptied1
$ [ ! -e deleted1 ] && echo "File deleted1 does not exist"
> File deleted1 does not exist
$ [ -e deleted1 -a ! -s deleted1 ] && echo "File deleted1 is empty"
$ [ ! -e emptied1 ] && echo "File emptied1 does not exist"
$ [ -e emptied1 -a ! -s emptied1 ] && echo "File emptied1 is empty"
> File emptied1 is empty
$ quilt fold < patches/using-timestamps.patch
> patching file deleted2
> patching file emptied2
$ [ ! -e deleted2 ] && echo "File deleted2 does not exist"
> File deleted2 does not exist
$ [ -e deleted2 -a ! -s deleted2 ] && echo "File deleted2 is empty"
$ [ ! -e emptied2 ] && echo "File emptied2 does not exist"
$ [ -e emptied2 -a ! -s emptied2 ] && echo "File emptied2 is empty"
> File emptied2 is empty
# Test quilt refresh
$ quilt delete
> Removing patch %{P}fold.patch
> No patches applied
> Removed patch %{P}fold.patch
$ quilt push -q
> Applying patch %{P}using-filenames.patch
> Now at patch %{P}using-filenames.patch
$ quilt refresh -pab --sort --no-index
> Refreshed patch %{P}using-filenames.patch
$ quilt pop -q
> Removing patch %{P}using-filenames.patch
> No patches applied
$ quilt push
> Applying patch %{P}using-filenames.patch
> patching file deleted1
> patching file emptied1
>
> Now at patch %{P}using-filenames.patch
$ [ ! -e deleted1 ] && echo "File deleted1 does not exist"
> File deleted1 does not exist
$ [ -e deleted1 -a ! -s deleted1 ] && echo "File deleted1 is empty"
$ [ ! -e emptied1 ] && echo "File emptied1 does not exist"
$ [ -e emptied1 -a ! -s emptied1 ] && echo "File emptied1 is empty"
> File emptied1 is empty
$ cat patches/using-filenames.patch
> --- a/deleted1
> +++ /dev/null
> @@ -1 +0,0 @@
> -will be deleted
> --- a/emptied1
> +++ b/emptied1
> @@ -1 +0,0 @@
> -will be emptied
|
