Re: [Quilt-dev] FWD: Bug#248950: quilt: Quilt is confused by patches which touch the same file twice

[Andreas Gruenbacher]

Hello,

this is a known bug of GNU patch; we have a fix for that in the SUSE package 
since more than a year. I've sent the patch upstream, we discussed it, I did 
the GNU paperwork, etc.; in the end I concluded that the maintainer is not 
really interested in fixing. The fix can be found at 
<ftp://ftp.suse.com/pub/people/agruen/patch/>; feel free to apply to the 
Debian package, re-propose, etc.

On Saturday 29 May 2004 08:35, Martin Quinson wrote:
> Sorry David. When I first read your bug report, I misunderstood it.
>
> Andreas, that's a bug reported against the debian package (as you guessed).
>
> In short, when you fold two patches manually by concatening them, you get
> into big troubles when the same file is touched by each part.  Specificaly,
> the backup file from the first chunk is overwriten when the second chunk is
> applied.
>
> I would say that adding '-V numbered' to the patch arguments in apatch, and
> then considering only "<filename>.~1~" in backup-file could do the trick.
>
> I'll prepare a patch if you think that's the way to go and if you want me
> to.

I don't like this approach. There really is no point in creating multiple 
backup copies for one patch. My proposed approach is to remember which files 
have been backed up instead.

Cheers,
-- 
Andreas Gruenbacher <address@hidden>
SUSE Labs, SUSE LINUX AG