Date: Thu, 14 Jun 2007 09:55:37 -0700 From: Chuck Swiger <cswiger@mac.com> To: LI Xin <delphij@delphij.net> Cc: FreeBSD Current <freebsd-current@freebsd.org> Subject: Re: RFC: diff(1) update Message-ID: <3DB5C61E-8902-4BA0-92C7-1C8D9B768F62@mac.com> In-Reply-To: <4670FD71.4070108@delphij.net> References: <466FB481.3090503@delphij.net> <96AE8CCB-5E8B-47EF-AE9A-8CA38AB9334E@mac.com> <4670FD71.4070108@delphij.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On Jun 14, 2007, at 1:33 AM, LI Xin wrote: > Chuck Swiger wrote: >> Paul Eggert, the diffutils maintainer, has recently adopted a >> patch for >> sdiff which allows using "1" and "2" in addition to "l" and "r", >> which >> is exceptionally useful when people are running mergemaster. Also, > > dmalone@ has pointed out that to me. Sounds reasonable and I will > take > it into account in the import. Excellent-- thank you so much. :-) >> v2.8.6 also includes a fix for invoking an editor in sdiff mode: > [snip] > > Do you think it's more sensible to just import 2.8.6 or 2.8.7 instead? > Or should I pull out the two changesets? The diff for the "1"/"2" keys is small and could be pulled out easily and used against 2.8.1; the fixes made in v2.8.6 for the subsidiary editor are more complex. I don't think Paul has pushed out a newer tarball than 2.8.1, so you'd have to pull the newer changes out of CVS (@ Savannah, probably?) one way or the other. Regards, -- -Chuck
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3DB5C61E-8902-4BA0-92C7-1C8D9B768F62>