From owner-freebsd-cvsweb  Tue Aug  6 10:31:27 2002
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 AC0AE37B401
	for <freebsd-cvsweb@FreeBSD.ORG>; Tue,  6 Aug 2002 10:31:25 -0700 (PDT)
Received: from ns2.comverse.com (ns2.comverse.com [63.64.185.243])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 14D5343E70
	for <freebsd-cvsweb@FreeBSD.ORG>; Tue,  6 Aug 2002 10:31:21 -0700 (PDT)
	(envelope-from Vassilii.Khachaturov@comverse.com)
Received: from mail-bridge.comverse.com (mail-bridge.comverse.com [10.200.7.190])
	by ns2.comverse.com (8.11.6/8.11.6) with ESMTP id g76HVAk28099;
	Tue, 6 Aug 2002 13:31:11 -0400
Received: by mail-bridge.comverse.com with Internet Mail Service (5.5.2653.19)
	id <Q14NX6FA>; Tue, 6 Aug 2002 13:27:32 -0400
Received: from mail-in.comverse.com (mail-in [10.230.12.30]) by mail-bridge.comverse.com with SMTP (Microsoft Exchange Internet Mail Service Version 5.5.2653.13)
	id Q14NX610; Tue, 6 Aug 2002 13:27:29 -0400
Received: by mail-in.comverse.com with Internet Mail Service (5.5.2653.19)
	id <PFT9NMKL>; Tue, 6 Aug 2002 13:27:15 -0400
From: Khachaturov Vassilii <Vassilii.Khachaturov@comverse.com>
To: "'Hiroki Sato'" <hrs@jp.FreeBSD.org>
Cc: freebsd-cvsweb@FreeBSD.ORG
Message-ID: <6B1DF6EEBA51D31182F200902740436803B24C09@mail-in.comverse.com>
Subject: RE: about delta generated by cvsweb
Date: Tue, 6 Aug 2002 13:27:05 -0400 
MIME-Version: 1.0
X-Mailer: Internet Mail Service (5.5.2653.19)
Content-Type: text/plain;
	charset="iso-8859-1"
Sender: owner-freebsd-cvsweb@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-cvsweb.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-cvsweb>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-cvsweb>
X-Loop: FreeBSD.ORG

> <URI:http://www.freebsd.org/cgi/cvsweb.cgi/src/release/doc/en_
> US.ISO8859-1/relnotes/common/new.sgml.diff?r1=1.22.2.249.2.10&
> r2=1.22.2.249.2.11>.
> 
>  The first line of the second chunk includes "options HZ=1000...",
>  but this part does not appear when simply using cvs diff.
> 
The @... chunk you are referring to is a product of the '-p' option passed
down to diff.
If you do a diff -up or cvs diff -up manually, you'll see it.
It comes in very handy to determine the context of the diff chunk.

From the cvsweb.conf:
# give out function names in diffs
# this just makes sense if we have C-files, otherwise
# diff's heuristic doesn't work well ..
# ( '-p' option to diff)
$showfunc = 1;

>  I think the part should not appear.  Is this a cvsweb's bug
>  or do I misunderstand something?

Suppress this option if you don't like it. Definitely not a bug.

Vassilii

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-cvsweb" in the body of the message