Re: patch bug (unified diffs)

[Mátyás János]

On Tue, 25 Jun 2002, Paul Eggert wrote:

> > From: <address@hidden>
> > Date: Tue, 25 Jun 2002 18:10:49 +0200 (CEST)
> >
> > I have the files 'old.java'and 'new.java' that not ends to a CR character.
> >
> > diff -u old.java new.java >a.diff
> > patch -p0 <a.diff old.java
> >
> > The patch will rejected.
> >
> > diff is GNU diffutils version 2.7
>
> Thanks for your bug report.  That bug should be fixed in GNU diffutils
> 2.8.1, which you can get from:
>
> ftp://ftp.gnu.org/gnu/diffutils/diffutils-2.8.1.tar.gz

I think the bug is in the patch utility which is in a different package.

If a create the diff with GNU diff 2.7, I can apply it with BSD patch 2.0,
compiled from NetBSD 1.5 base.tgz sources. The BSD diff and GNU diff 2.7's
output are same, so the patch fails.

We use cvs in software development and there are conflicts due this bug.
Please create at least a workaround in the patch util.

Jani