Date: Sat, 26 Mar 2011 11:00:12 +0000 From: Alexander Best <arundel@freebsd.org> To: Artem Belevich <fbsdlist@src.cx> Cc: Garrett Cooper <yanegomi@gmail.com>, Bruce Cran <bruce@cran.org.uk>, freebsd-current@freebsd.org, Nerius Landys <nlandys@gmail.com> Subject: Re: Getting /usr/src/ from SVN directly? Message-ID: <20110326110012.GA73916@freebsd.org> In-Reply-To: <BANLkTim5=V6sFV_a2xc2dTSOt_kDfGuYoA@mail.gmail.com> References: <AANLkTik%2BKcxpO47JH8z-ezTJD3ZH-ozJSp1xfgRYpWNs@mail.gmail.com> <20110325233826.00000cab@unknown> <AA26C490-6CCD-4EF1-9874-28534982DDA2@gmail.com> <AANLkTikq_yoeh4DtOV5wShZ0YqA1goNEbkttP2i1EQbF@mail.gmail.com> <BANLkTim5=V6sFV_a2xc2dTSOt_kDfGuYoA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri Mar 25 11, Artem Belevich wrote: > --Artem > > > > On Fri, Mar 25, 2011 at 8:05 PM, Nerius Landys <nlandys@gmail.com> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110326110012.GA73916>