1 files changed, 168 insertions, 0 deletions
diff --git a/zarb-ml/mageia-dev/2012-January/011163.html b/zarb-ml/mageia-dev/2012-January/011163.html
new file mode 100644
index 000000000..9a928e0f2
--- /dev/null
+++ b/zarb-ml/mageia-dev/2012-January/011163.html
@@ -0,0 +1,168 @@
+<!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=%3C201201091354.49963.monnier.florent%40gmail.com%3E">
+   <META NAME="robots" CONTENT="index,nofollow">
+   <META http-equiv="Content-Type" content="text/html; charset=us-ascii">
+   <LINK REL="Previous"  HREF="011157.html">
+   <LINK REL="Next"  HREF="011164.html">
+ </HEAD>
+ <BODY BGCOLOR="#ffffff">
+   <H1>[Mageia-dev] patches overlapping</H1>
+    <B>Florent Monnier</B> 
+    <A HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20patches%20overlapping&In-Reply-To=%3C201201091354.49963.monnier.florent%40gmail.com%3E"
+       TITLE="[Mageia-dev] patches overlapping">monnier.florent at gmail.com
+       </A><BR>
+    <I>Mon Jan  9 13:54:49 CET 2012</I>
+    <P><UL>
+        <LI>Previous message: <A HREF="011157.html">[Mageia-dev] [changelog] [RPM] cauldron core/release	perl-FusionInventory-Agent-2.1.13-1.mga2
+</A></li>
+        <LI>Next message: <A HREF="011164.html">[Mageia-dev] patches overlapping
+</A></li>
+         <LI> <B>Messages sorted by:</B> 
+              <a href="date.html#11163">[ date ]</a>
+              <a href="thread.html#11163">[ thread ]</a>
+              <a href="subject.html#11163">[ subject ]</a>
+              <a href="author.html#11163">[ author ]</a>
+         </LI>
+       </UL>
+    <HR>  
+<!--beginarticle-->
+<PRE>Hi,
+
+I have a package with 2 patches, each modifying one line that is in the 
+context of the other patch. So the second one that is applied is rejected.
+
+I would like to know what is the correct way to handle this?
+
+Should the context of the second one correspond to the modified version by the 
+first one?
+(Also using only 2 lines of context instead of 3 lines would resolve it in my 
+case.)
+
+Thanks
+</PRE>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!--endarticle-->
+    <HR>
+    <P><UL>
+        <!--threads-->
+	<LI>Previous message: <A HREF="011157.html">[Mageia-dev] [changelog] [RPM] cauldron core/release	perl-FusionInventory-Agent-2.1.13-1.mga2
+</A></li>
+	<LI>Next message: <A HREF="011164.html">[Mageia-dev] patches overlapping
+</A></li>
+         <LI> <B>Messages sorted by:</B> 
+              <a href="date.html#11163">[ date ]</a>
+              <a href="thread.html#11163">[ thread ]</a>
+              <a href="subject.html#11163">[ subject ]</a>
+              <a href="author.html#11163">[ 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>