From 1be510f9529cb082f802408b472a77d074b394c0 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier Date: Sun, 14 Apr 2013 13:46:12 +0000 Subject: Add zarb MLs html archives --- zarb-ml/mageia-dev/2012-January/011163.html | 168 ++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) create mode 100644 zarb-ml/mageia-dev/2012-January/011163.html (limited to 'zarb-ml/mageia-dev/2012-January/011163.html') 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 @@ + + + + [Mageia-dev] patches overlapping + + + + + + + + + +

[Mageia-dev] patches overlapping

+ Florent Monnier + monnier.florent at gmail.com +
+ Mon Jan 9 13:54:49 CET 2012 +

+
+ +
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
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

+ +
+More information about the Mageia-dev +mailing list
+ -- cgit v1.2.1