From owner-freebsd-hackers Tue Nov 7 0:31: 7 2000 Delivered-To: freebsd-hackers@freebsd.org Received: from ringworld.oblivion.bg (pool153-tch-1.Sofia.0rbitel.net [212.95.170.153]) by hub.freebsd.org (Postfix) with SMTP id 5955437B4D7 for ; Tue, 7 Nov 2000 00:30:59 -0800 (PST) Received: (qmail 2090 invoked by uid 1000); 7 Nov 2000 08:30:48 -0000 Date: Tue, 7 Nov 2000 10:30:48 +0200 From: Peter Pentchev To: Doug Barton Cc: hackers@FreeBSD.org Subject: Re: New mergemaster behavior - comparing CVS $Id too Message-ID: <20001107103048.B314@ringworld.oblivion.bg> Mail-Followup-To: Doug Barton , hackers@FreeBSD.org References: <20001106134437.A556@ringworld.oblivion.bg> <3A07BA12.A3CD8C88@FreeBSD.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <3A07BA12.A3CD8C88@FreeBSD.org>; from DougB@FreeBSD.org on Tue, Nov 07, 2000 at 12:15:14AM -0800 Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Tue, Nov 07, 2000 at 12:15:14AM -0800, Doug Barton wrote: > 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. Ahhhhhh... well I guess I should read my manuals a bit more :) I *thought* I'd read the parts about tags and such, and yet I've managed to miss all the info about 'cvs status'. But hey, it isn't included in the 'CVS commands' section :P (although yes, it is in the 'cvs --help-commands' output..) > 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. Hmmm alright, I'll buy the *BSD compatibility one. Thanks for the answer :) G'luck, Peter -- Thit sentence is not self-referential because "thit" is not a word. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message