From owner-freebsd-audit@FreeBSD.ORG Wed Jan 12 20:34:54 2005 Return-Path: Delivered-To: freebsd-audit@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D6FCE16A4CE; Wed, 12 Jan 2005 20:34:54 +0000 (GMT) Received: from smtp1.server.rpi.edu (smtp1.server.rpi.edu [128.113.2.1]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6581943D31; Wed, 12 Jan 2005 20:34:54 +0000 (GMT) (envelope-from drosih@rpi.edu) Received: from [128.113.24.47] (gilead.netel.rpi.edu [128.113.24.47]) by smtp1.server.rpi.edu (8.13.0/8.13.0) with ESMTP id j0CKYpcv019259; Wed, 12 Jan 2005 15:34:53 -0500 Mime-Version: 1.0 Message-Id: In-Reply-To: <20050112135336.GC68344@heechee.tobez.org> References: <20050112135336.GC68344@heechee.tobez.org> Date: Wed, 12 Jan 2005 15:34:50 -0500 To: Anton Berezin , freebsd-audit@freebsd.org From: Garance A Drosihn Content-Type: text/plain; charset="us-ascii" ; format="flowed" X-CanItPRO-Stream: default X-RPI-SA-Score: undef - spam-scanning disabled X-Scanned-By: CanIt (www . canit . ca) cc: DougB@freebsd.org Subject: Re: [PATCH] review requested, add a feature to mergemaster X-BeenThere: freebsd-audit@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: FreeBSD Security Audit List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Jan 2005 20:34:55 -0000 At 2:53 PM +0100 1/12/05, Anton Berezin wrote: >Following the idea by Sune Stjerneby, suggestions from Andrzej >Tobola and Phil Regnauld, and a bit of discussion on -current, >I would like to request a review of a new mergemaster feature >aimed to simplify manual work in some cases. > >A new option is added: > > -R cvsroot For files that contain a $FreeBSD$ string, Hmm. I'm not sure how useful this will be (not that I object to it in anyway, I'm just not sure...). But let me note: >=================================================================== >RCS file: /home/ncvs/src/usr.sbin/mergemaster/mergemaster.8,v >retrieving revision 1.29 >diff -u -r1.29 mergemaster.8 >+.It Fl R Ar cvsroot >+For files that contain a $FreeBSD$ string, >+but which does not match the one in the corresponding file >+in the temporary root, >+attempt to extract the same version from the >+.Fx >+CVS repository specified by >+.Ar cvsroot. Be careful when trying to add the literal string of $FreeBSD$ to any documentation file. This will look fine when you are testing it, but when you *commit* it, CVS will expand that string into the FreeBSD-version information for that file. I forget what you have to do to get the right results, but you don't want to have the literal '$FreeBSD$' string in the file. -- Garance Alistair Drosehn = gad@gilead.netel.rpi.edu Senior Systems Programmer or gad@freebsd.org Rensselaer Polytechnic Institute or drosih@rpi.edu