Date: Mon, 23 Feb 2004 14:35:03 -0600 From: Jon Noack <noackjr@alumni.rice.edu> To: freebsd-cvsweb@FreeBSD.org Subject: Re: "f" => "sc" gives diff error Message-ID: <403A63F7.2010803@alumni.rice.edu> In-Reply-To: <1077564410.14512.74.camel@bobcat.mine.nu> References: <4039F04F.7030504@alumni.rice.edu> <1077564410.14512.74.camel@bobcat.mine.nu>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2/23/2004 1:26 PM, Ville Skytt=E4 wrote: > On Mon, 2004-02-23 at 14:21, Jon Noack wrote: >=20 >>Setting "f" =3D> "sc" results in this error when attempting to view a=20 >>preferred diff: >>/usr/bin/diff: conflicting specifications of output style >=20 > [...] >=20 >>diff - GNU diffutils version 2.7 (FreeBSD base system) >=20 > Yep, with Enscript colored side by side diffs, the -p option is > erroneously passed to rcsdiff (and thus to diff). And diff(1) from > diffutils < 2.8 does not like that, while at least 2.8.1 seems to ignor= e > it. A quick fix against CVSweb 2.9.3 is attached. Thanks for the > report! Good deal -- that works now. The problem now (with enscript=20 side-by-side) is that anything with lines ending in ">" (and possibly=20 others) are treated as changed lines and colorized. This pretty much=20 makes it useless with html. Oh well, I think I like the CVSweb=20 side-by-side better anyway -- back to "uc". Just thought you'd like to=20 know... Thanks again! Jon Noack
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?403A63F7.2010803>