--Artem On Fri, Mar 25, 2011 at 8:05 PM, Nerius Landys <nlandys_at_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.*[$]' --ArtemReceived on Sat Mar 26 2011 - 02:43:51 UTC
This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:40:12 UTC