From owner-freebsd-cvsweb@FreeBSD.ORG  Wed Mar 17 15:33:45 2004
Return-Path: <owner-freebsd-cvsweb@FreeBSD.ORG>
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 C3B0E16A4CE
	for <freebsd-cvsweb@freebsd.org>;
	Wed, 17 Mar 2004 15:33:45 -0800 (PST)
Received: from adl0133.systems.sa.gov.au (adl0133.systems.sa.gov.au
	[143.216.236.20])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 25CD943D39
	for <freebsd-cvsweb@freebsd.org>;
	Wed, 17 Mar 2004 15:33:45 -0800 (PST)
	(envelope-from Vandertouw.Justin@saugov.sa.gov.au)
Received: from adl0133.systems.sa.gov.au (localhost [127.0.0.1])
	(8.12.10/8.12.7) with ESMTP id i2HNXgnr001966
	for <freebsd-cvsweb@freebsd.org>;
	Thu, 18 Mar 2004 10:03:42 +1030 (CST)'
Received: from sagemsbb006.saugov.sa.gov.au (sagemsbb006.sagemsmrd01.sa.gov.au
	[143.216.59.14])(8.12.10/8.12.7) with ESMTP id i2HNXVGU001765
	for <freebsd-cvsweb@freebsd.org>;
	Thu, 18 Mar 2004 10:03:31 +1030 (CST)'
Received: by sagemsbb006.sagemsmrd01.sa.gov.au with Internet Mail Service
	(5.5.2657.72)	id <HC8Y3VVF>; Thu, 18 Mar 2004 10:03:07 +1030
Message-ID: <7108E4F65252BD42BA13488051EBE3022A1612@sagemsg0010.sagemsmrd01.sa.gov.au>
From: "Vandertouw, Justin (DEH)" <Vandertouw.Justin@saugov.sa.gov.au>
To: "'freebsd-cvsweb@freebsd.org'" <freebsd-cvsweb@freebsd.org>
Date: Thu, 18 Mar 2004 10:03:05 +1030
MIME-Version: 1.0
X-Mailer: Internet Mail Service (5.5.2657.72)
Content-Type: text/plain
Subject: Re: Option to ignore Windows linefeeds when diff-ing
X-BeenThere: freebsd-cvsweb@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS Web maintenance mailing list <freebsd-cvsweb.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-cvsweb>,
	<mailto:freebsd-cvsweb-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-cvsweb>
List-Post: <mailto:freebsd-cvsweb@freebsd.org>
List-Help: <mailto:freebsd-cvsweb-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-cvsweb>,
	<mailto:freebsd-cvsweb-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Mar 2004 23:33:45 -0000


On Wed, 17 Mar 2004 21:29:19 +0200 VilleSkytt?<scop@FreeBSD.org> wrote:

>On Wed, 2004-03-03 at 02:40, Vandertouw, Justin (DEH) wrote:

>> then i thought maybe we could let the user tell cvsweb diff to ignore the
>> end-of-line (^M) that Windows inserts.

>Maybe adding some switches to diff(1) in cvsweb.cgi's %DIFFTYPES helps,
>for example (some of) -w -b -B?

good idea1 i've implemented this - the users have since indicated that they
also 
want merge to ignore ^Ms so i think the problem need sto be fixed at its
source
ie, remove the ^Ms automagically (and appropriately) at check-in time, so i
have 
a little job to research ;)