[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