From owner-freebsd-current@FreeBSD.ORG Sat Mar 26 11:00:13 2011 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1233) id 249191065677; Sat, 26 Mar 2011 11:00:13 +0000 (UTC) Date: Sat, 26 Mar 2011 11:00:12 +0000 From: Alexander Best To: Artem Belevich Message-ID: <20110326110012.GA73916@freebsd.org> References: <20110325233826.00000cab@unknown> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Cc: Garrett Cooper , Bruce Cran , freebsd-current@freebsd.org, Nerius Landys Subject: Re: Getting /usr/src/ from SVN directly? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Mar 2011 11:00:13 -0000 On Fri Mar 25 11, Artem Belevich wrote: > --Artem > > > > On Fri, Mar 25, 2011 at 8:05 PM, Nerius Landys wrote: > >> Use devel/subversion-freebsd though so it expands the $FreeBSD$ RCS tag. > > > > I just did that.  I am afraid however that all of my files in /etc > > will have a different RCS tag.  For example, I got /usr/src/ via SVN > > directly (head, or CURRENT) and did a mergemaster prebuildworld step, > > and I get this diff in /etc/group: > > > > -# $FreeBSD: src/etc/group,v 1.36 2011/01/28 22:28:12 pjd Exp $ > > +# $FreeBSD: head/etc/group 218046 2011-01-28 22:28:12Z pjd $ > > > > Is there any way that these diffs can be avoided?  Is the only real > > solution to just go through mergemaster file-by-file and install all > > of the new ones [even though they differ only in this tag]? > > I have following line in my /etc/mergemaster.rc that tells mergemaster > to ignore $FreeBSD$ keywords altogether. > > DIFF_OPTIONS='-I$FreeBSD.*[$]' one could also use the -F switch in connection with mergemaster(8). > > --Artem -- a13x