Date: Mon, 22 Jan 2001 23:50:02 -0800 (PST) From: Peter Pentchev <roam@orbitel.bg> To: freebsd-bugs@FreeBSD.org Subject: Re: bin/24564: local ident strings interfere with mergemaster Message-ID: <200101230750.f0N7o2I81387@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR bin/24564; it has been noted by GNATS.
From: Peter Pentchev <roam@orbitel.bg>
To: Josef Karthauser <joe@tao.org.uk>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: bin/24564: local ident strings interfere with mergemaster
Date: Tue, 23 Jan 2001 09:47:22 +0200
On Mon, Jan 22, 2001 at 04:00:02PM -0800, Josef Karthauser wrote:
> 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
> > >Originator: Tony Finch
> > >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.
Actually, this is not strictly true. mergemaster was recently changed
so it does a comparison on *all* CVS $Tags$ for a file, so even going
with the plain vanilla Id tags makes mergemaster complain.
When this was done, I emailed Doug Barton and -hackers about it, and
in Message-ID: <3A07BA12.A3CD8C88@FreeBSD.org> Doug said:
<quote from Doug's email>
Peter Pentchev wrote:
>
> Is there a way to make mergemaster revert to its old behavior - only
> comparing $FreeBSD tags on files which have those?
Of course there is a way, the question is how likely it is to happen.
:) You've stated the solution, just take the local tags out for now.
They don't tell you anything that 'cvs status' doesn't already tell you.
I struggled with this change, because I myself use a CVS repo to store
local mods to config files. One of the goals of the current round of
mergemaster mods is to make the thing more palatable across *BSD
platforms. There were already too many if it's one $Id tag or another
definitions in the old code, and it was going to get bigger. If there is
a great hue and cry over this problem, I'll look at changing it back,
but frankly my inclination is that using 'ident' is going to be the best
solution long term.
</quote from Doug's email>
After which I found out that 'cvs status' does indeed do all I wanted :)
Tony, is this answer enough? 'Cause I do not really think Doug is going
to back out his change, when it does not really need to be backed out or
made configurable..
G'luck,
Peter
--
If this sentence were in Chinese, it would say something else.
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200101230750.f0N7o2I81387>