blob: 5305d74482d23519f3a26166f584aecdeb623c02 (
plain)
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
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-dev] patches overlapping
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20patches%20overlapping&In-Reply-To=%3C4F0AEBA7.5020504%40colin.guthr.ie%3E">
<META NAME="robots" CONTENT="index,nofollow">
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
<LINK REL="Previous" HREF="011163.html">
<LINK REL="Next" HREF="011168.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-dev] patches overlapping</H1>
<B>Colin Guthrie</B>
<A HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20patches%20overlapping&In-Reply-To=%3C4F0AEBA7.5020504%40colin.guthr.ie%3E"
TITLE="[Mageia-dev] patches overlapping">mageia at colin.guthr.ie
</A><BR>
<I>Mon Jan 9 14:29:11 CET 2012</I>
<P><UL>
<LI>Previous message: <A HREF="011163.html">[Mageia-dev] patches overlapping
</A></li>
<LI>Next message: <A HREF="011168.html">[Mageia-dev] Install prompt about pcmcia and 2.2 kernel
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#11164">[ date ]</a>
<a href="thread.html#11164">[ thread ]</a>
<a href="subject.html#11164">[ subject ]</a>
<a href="author.html#11164">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>'Twas brillig, and Florent Monnier at 09/01/12 12:54 did gyre and gimble:
><i> Hi,
</I>><i>
</I>><i> I have a package with 2 patches, each modifying one line that is in the
</I>><i> context of the other patch. So the second one that is applied is rejected.
</I>><i>
</I>><i> I would like to know what is the correct way to handle this?
</I>><i>
</I>><i> Should the context of the second one correspond to the modified version by the
</I>><i> first one?
</I>><i> (Also using only 2 lines of context instead of 3 lines would resolve it in my
</I>><i> case.)
</I>
They should apply in order. So if the first one changes something that
the second one uses in it's context, the second patch should be updated
to include the changed context.
But better to try and push the changes upstream if at all possible. If
it's some customisation that we do that isn't relevant for upstream then
it may be easier to combine the patches into one, again only if that's
relevant to do so.
Col
--
Colin Guthrie
colin(at)mageia.org
<A HREF="http://colin.guthr.ie/">http://colin.guthr.ie/</A>
Day Job:
Tribalogic Limited <A HREF="http://www.tribalogic.net/">http://www.tribalogic.net/</A>
Open Source:
Mageia Contributor <A HREF="http://www.mageia.org/">http://www.mageia.org/</A>
PulseAudio Hacker <A HREF="http://www.pulseaudio.org/">http://www.pulseaudio.org/</A>
Trac Hacker <A HREF="http://trac.edgewall.org/">http://trac.edgewall.org/</A>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="011163.html">[Mageia-dev] patches overlapping
</A></li>
<LI>Next message: <A HREF="011168.html">[Mageia-dev] Install prompt about pcmcia and 2.2 kernel
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#11164">[ date ]</a>
<a href="thread.html#11164">[ thread ]</a>
<a href="subject.html#11164">[ subject ]</a>
<a href="author.html#11164">[ author ]</a>
</LI>
</UL>
<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-dev">More information about the Mageia-dev
mailing list</a><br>
</body></html>
|
