From owner-freebsd-cvsweb@FreeBSD.ORG Mon Feb 23 12:35:11 2004 Return-Path: Delivered-To: freebsd-cvsweb@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B89D816A4CE for ; Mon, 23 Feb 2004 12:35:11 -0800 (PST) Received: from cmsrelay02.mx.net (cmsrelay02.mx.net [165.212.11.111]) by mx1.FreeBSD.org (Postfix) with SMTP id 9C3F743D3F for ; Mon, 23 Feb 2004 12:35:11 -0800 (PST) (envelope-from noackjr@alumni.rice.edu) Received: from uadvg128.cms.usa.net (165.212.11.128) by cmsoutbound.mx.net with SMTP; 23 Feb 2004 20:35:11 -0000 Received: from optimator.noacks.org [66.136.22.254] by uadvg128.cms.usa.net (ASMTP/noackjr@usa.net) via mtad (C8.MAIN.3.13N) with ESMTP id 381iBwuji0221M28; Mon, 23 Feb 2004 20:35:08 GMT X-USANET-Auth: 66.136.22.254 AUTH noackjr@usa.net optimator.noacks.org Received: from localhost (localhost [127.0.0.1]) by optimator.noacks.org (Postfix) with ESMTP id 6B8DC6112 for ; Mon, 23 Feb 2004 14:35:07 -0600 (CST) Received: from optimator.noacks.org ([127.0.0.1]) by localhost (optimator.noacks.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 66545-06 for ; Mon, 23 Feb 2004 14:35:06 -0600 (CST) Received: from alumni.rice.edu (compgeek [192.168.1.10]) by optimator.noacks.org (Postfix) with ESMTP id 634A56110 for ; Mon, 23 Feb 2004 14:35:06 -0600 (CST) Message-ID: <403A63F7.2010803@alumni.rice.edu> Date: Mon, 23 Feb 2004 14:35:03 -0600 From: Jon Noack User-Agent: Mozilla Thunderbird 0.5 (Windows/20040207) X-Accept-Language: en-us, en MIME-Version: 1.0 To: freebsd-cvsweb@FreeBSD.org References: <4039F04F.7030504@alumni.rice.edu> <1077564410.14512.74.camel@bobcat.mine.nu> In-Reply-To: <1077564410.14512.74.camel@bobcat.mine.nu> Content-Type: text/plain; charset=ISO-8859-1; format=flowed X-Virus-Scanned: by amavisd-new at noacks.org Content-Transfer-Encoding: quoted-printable Subject: Re: "f" => "sc" gives diff error X-BeenThere: freebsd-cvsweb@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: noackjr@alumni.rice.edu List-Id: CVS Web maintenance mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Feb 2004 20:35:11 -0000 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