Re: CVS/Diff merge defect. (fwd)

[Paul Eggert]

This message follows up on an old Diff bug report by Kevin Pearson
<http://www.red-bean.com/bug-cvs/0600.html>
and proposed patch by Karl Tomlinson
<http://www.red-bean.com/bug-cvs/0745.html>.

> Date: Tue, 15 Aug 2000 16:33:50 +1200
> From: Karl Tomlinson <k.tomlinson@auckland.ac.nz>
> 
> I include patches for version 2.7 of diffutils to use OLDFILE as the
> common file when a merge or edscript is requested of diff3.  I think the
> --inhibit-hunk-merge option of 2.7.2 is no longer required.

Thanks for the analysis and patch.  I fixed the problem in a somewhat
different way, and you can see the result in the latest test version
of GNU diffutils, in:

ftp://alpha.gnu.org/gnu/diffutils/diffutils-2.7.10.tar.gz

(The fix has actually been present since diffutils test version 2.7.3
 in November, but I forgot to drop you a line then.)

> I can submit patches for cvs also but I'll wait to see if there is
> feedback on this.

Sorry about the late feedback, and thanks again for the fix.  (Also
thanks to Jim Meyering who kept bugging me to release a fixed version
of diffutils.  :-)