"f" => "sc" gives diff error

VilleSkyttä scop at FreeBSD.org
Mon Feb 23 11:26:53 PST 2004


On Mon, 2004-02-23 at 14:21, Jon Noack wrote:
> Setting "f" => "sc" results in this error when attempting to view a 
> preferred diff:
> /usr/bin/diff: conflicting specifications of output style
[...]
> diff - GNU diffutils version 2.7 (FreeBSD base system)

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 ignore
it.  A quick fix against CVSweb 2.9.3 is attached.  Thanks for the
report!
-------------- next part --------------
A non-text attachment was scrubbed...
Name: cvsweb-sc.patch
Type: text/x-patch
Size: 281 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-cvsweb/attachments/20040223/733eac78/cvsweb-sc.bin


More information about the freebsd-cvsweb mailing list