diff options
Diffstat (limited to 'zarb-ml/mageia-dev/2012-January/011164.html')
| -rw-r--r-- | zarb-ml/mageia-dev/2012-January/011164.html | 192 |
1 files changed, 192 insertions, 0 deletions
diff --git a/zarb-ml/mageia-dev/2012-January/011164.html b/zarb-ml/mageia-dev/2012-January/011164.html new file mode 100644 index 000000000..5305d7448 --- /dev/null +++ b/zarb-ml/mageia-dev/2012-January/011164.html @@ -0,0 +1,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> |