From owner-freebsd-bugs  Mon Jan 22 16: 0:21 2001
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 851C737B402
	for <freebsd-bugs@hub.freebsd.org>; Mon, 22 Jan 2001 16:00:02 -0800 (PST)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f0N002213730;
	Mon, 22 Jan 2001 16:00:02 -0800 (PST)
	(envelope-from gnats)
Date: Mon, 22 Jan 2001 16:00:02 -0800 (PST)
Message-Id: <200101230000.f0N002213730@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
Cc: 
From: Josef Karthauser <joe@tao.org.uk>
Subject: Re: bin/24564: local ident strings interfere with mergemaster
Reply-To: Josef Karthauser <joe@tao.org.uk>
Sender: owner-freebsd-bugs@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org

The following reply was made to PR bin/24564; it has been noted by GNATS.

From: Josef Karthauser <joe@tao.org.uk>
To: Tony Finch <dot@dotat.at>
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: bin/24564: local ident strings interfere with mergemaster
Date: Mon, 22 Jan 2001 23:52:41 +0000

 --+g7M9IMkV8truYOl
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 On Mon, Jan 22, 2001 at 11:24:00PM +0000, Tony Finch wrote:
 >=20
 > >Number:         24564
 > >Category:       bin
 > >Synopsis:       local ident strings interfere with mergemaster
 > >Confidential:   no
 > >Severity:       serious
 > >Priority:       medium
 > >Responsible:    freebsd-bugs
 > >State:          open
 > >Quarter:       =20
 > >Keywords:      =20
 > >Date-Required:
 > >Class:          change-request
 > >Submitter-Id:   current-users
 > >Arrival-Date:   Mon Jan 22 15:30:02 PST 2001
 > >Closed-Date:
 > >Last-Modified:
 > >Originator:     Tony Finch
 > >Release:        FreeBSD 4.2-BETA-20001113 i386
 > >Organization:
 > Covalent Technologies Inc.
 > >Environment:
 >=20
 > FreeBSD hand.dotat.at 4.2-BETA-20001113 FreeBSD 4.2-BETA-20001113 #0: Tue=
  Nov 14 00:42:35 UTC 2000     fanf@hand.dotat.at:/FreeBSD/obj/FreeBSD/relen=
 g4/sys/DELL-Latitude-CPx  i386
 >=20
 > >Description:
 >=20
 > Mergemaster has a "non-strict comparison" facility for ignoring
 > local changes to files if the cvs idents have not been changed from
 > the standard version of the file. This makes mergemaster runs much
 > less time-consuming.
 >=20
 > However, if (like me) you keep system configuration files in CVS
 > then the ident strings will no longer match exactly, and the benefit
 > of non-strict comparisons is lost.
 >=20
 > This problem can be avoided by ignoring extra ident strings in the
 > destination file, and instead only checking that all the ident strings
 > in the source file are present in the destination file.
 
 Or using a different tag instead of $FreeBSD$, in your local
 repository.  In this case mergemaster will do exactly the right
 thing :).
 
 It's fairly straightforward to configure a copy of the project's
 CVSROOT scripts to do the job.
 
 Joe
 
 --+g7M9IMkV8truYOl
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.0.4 (FreeBSD)
 Comment: For info see http://www.gnupg.org
 
 iEYEARECAAYFAjpsx8gACgkQXVIcjOaxUBao0gCgohwOa+iwdMWGY7T5fAH/g2vt
 mZsAnjCTmg7W2Dl/BCszvr1MNIAQd1gF
 =O+zi
 -----END PGP SIGNATURE-----
 
 --+g7M9IMkV8truYOl--
 


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