Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 26 Mar 2011 10:31:39 -0700
From:      Nerius Landys <nlandys@gmail.com>
To:        Alexander Best <arundel@freebsd.org>
Cc:        Garrett Cooper <yanegomi@gmail.com>, Bruce Cran <bruce@cran.org.uk>, freebsd-current@freebsd.org, Artem Belevich <fbsdlist@src.cx>
Subject:   Re: Getting /usr/src/ from SVN directly?
Message-ID:  <AANLkTinoEJFdugT86v-vVjkh_gcVN1OFxM4h-H0gXW_p@mail.gmail.com>
In-Reply-To: <20110326110012.GA73916@freebsd.org>
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> <20110326110012.GA73916@freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
> one could also use the -F switch in connection with mergemaster(8).

>From mergemaster manpage:

"If the files differ only by VCS Id ($FreeBSD) install the new file."

Yes that is exactly what I want, thanks.

By the way, are there any other ways that are more preferred to get
/usr/src/ than doing what I've done, which is using
devel/subversion-freebsd to checkout head into /usr/src/?



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTinoEJFdugT86v-vVjkh_gcVN1OFxM4h-H0gXW_p>