Date: Wed, 12 Jan 2005 15:34:50 -0500 From: Garance A Drosihn <drosih@rpi.edu> To: Anton Berezin <tobez@freebsd.org>, freebsd-audit@freebsd.org Cc: DougB@freebsd.org Subject: Re: [PATCH] review requested, add a feature to mergemaster Message-ID: <p0620070fbe0b38ec30b5@[128.113.24.47]> In-Reply-To: <20050112135336.GC68344@heechee.tobez.org> References: <20050112135336.GC68344@heechee.tobez.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?p0620070fbe0b38ec30b5>