fixed 717411 0.3.4-1
thanks

+gcs

On Fri, Apr 17, 2015 at 08:20:47AM +0300, Kirill Smelkov wrote:
> On Sat, Jul 20, 2013 at 03:10:20PM +0100, peter green wrote:
> > Package: patchutils
> > Severity: normal
> > Version: 0.3.2-2
> > 
> > The attatched patch is a reduced version (the original was massive) of a
> > patch generated from git. When trying to feed it to interdiff I get errors
> > like:
> > 
> > root@debian:/# interdiff test2.diff test2.diff
> > The next patch would create the file /tmp/interdiff-1.QMmyg0,
> > which already exists!  Assume -R? [n]
> > 
> > In the middle of the file are the following two lines:
> > 
> > diff --git a/arch/arm/mach-bcm2708/bcm2708.h
> > b/arch/arm/mach-bcm2708/bcm2708.h
> > new file mode 100644
> > 
> > Which as I understand the patch format do not form a part of the actual
> > patch and should be ignored by toools.
> > 
> > However if I remove either of these two lines then interdiff accepts the
> > patch without errors.
> > 
> > Any idea what is going on?
> 
> FYI it looks like interdiff did not know about git patch headers and
> that was just fixed upstream 3 days ago:
> 
> https://github.com/twaugh/patchutils/commit/14261ad5461e6c4b3ffc2f87131601ff79e2a0fc
> (and several previous commits)

I've just re-tested with freshly uploaded patchutils, and where
interdiff from patchutils_0.3.3-1 was failing, with 0.3.4-1 it now works
ok.

Thanks,
Kirill


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to