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

[Martin Quinson]

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.


Thanks for your time, Mt.

----- Forwarded message from David Gibson <address@hidden> -----

Subject: Bug#248950: quilt: Quilt is confused by patches which touch the same 
file twice
X-Debian-PR-Package: quilt
Date: Fri, 28 May 2004 11:13:00 +1000
From: David Gibson <address@hidden>
To: Martin Quinson <address@hidden>
Cc: address@hidden

On Thu, May 27, 2004 at 10:36:29AM -0700, Martin Quinson wrote:
> dude, I believe this bug is not of severity normal, but wishlist. You use a
> broken (at the very least unregular) patch file, and try to use it as if
> nothing special happened. You really should refresh such patch as soon as
> possible. 
> 
> In other words, I don't feel it as a problem that you cannot push, pop, push
> such patch. You should push, refresh, pop, push it.
> 
> Anyway, I'll forward it to upstream author to see if he wants to fix it
> anyway.

No the problem is you can't refresh either; well, you can but it
generates a broken patch with the behaviour described.  When you first
push the patch, the second chunk affecting the file clobbers the
backup file from the first chunk, so when you refresh, the diff is
against the file with the first hunk applied, but not the second.

Sorry, I've been meaning to get you an example patch and so forth, but
I've been distracted by other things.

> On Fri, May 14, 2004 at 02:13:13PM +1000, David Gibson wrote:
> > Package: quilt
> > Version: 0.30-4
> > Severity: normal
> > 
> > Quilt appears to be confused by a particular patch, if pushed, then
> > popped then pushed again, the push fails the second time.  I believe the
> > problem is that the patch modifies the same file twice (it was created
> > by concatenating, in the correct order, two other patches which each
> > work properly on their own).  I assume the behaviour of patch -b is
> > clobbering the original backup file with one created before applying the
> > second diff to the file in question.
> > 
> > Debian Release: testing/unstable
> >   APT prefers unstable
> >   APT policy: (500, 'unstable')
> > Architecture: powerpc (ppc64)
> > Kernel: Linux 2.6.6-rc2
> > Locale: LANG=C, LC_CTYPE=C
> > 
> > Versions of packages quilt depends on:
> > ii  bzip2                         1.0.2-1    A high-quality block-sorting 
> > file 
> > ii  diffstat                      1.34-1     produces graph of changes 
> > introduc
> > ii  gawk                          1:3.1.3-3  GNU awk, a pattern scanning 
> > and pr
> > ii  gettext                       0.14.1-2   GNU Internationalization 
> > utilities
> > ii  patch                         2.5.9-1    Apply a diff file to an 
> > original
> > 
> > 
> > 
> 



-- 
David Gibson                    | For every complex problem there is a
david AT gibson.dropbear.id.au  | solution which is simple, neat and
                                | wrong.
http://www.ozlabs.org/people/dgibson



----- End forwarded message -----

-- 
Dans la france profonde, il y a surtout des spéléologues.
   -- Le Chat

signature.asc
Description: Digital signature