Mergemaster with Freebsd-Update

[Warren Block]

On Mon, 19 Jan 2015, Warren Block wrote:

> On Mon, 19 Jan 2015, Chris Maness wrote:
>
>> On Jan 19, 2015 12:07 PM, "Daniel Corbe" <corbe at corbe.net> wrote:
>>> 
>>> 
>>> Chris Maness <chris at chrismaness.com> writes:
>>>> 
>>>> Also, is the a tool like portsnap for my source tree?  I used svn the
>> last
>>>> time and downloaded the whole version 10.0 tree.  I think I should be
>> able
>>>> to apply deltas only for the minor upgrade to 10.1, but google has not
>> been
>>>> my friend here.  I know that svn has that capability like cvsup did,
>> but I
>>>> have not been able to figure it out.
>>>> 
>>>> Thanks,
>>>> Chris
>>> 
>>> Once you've fetched the entire tree for the first time, all you need to
>>> do is continually run svn fetch in /usr/src to grab any updates or
>>> additions.
>>> 
>> 
>> I had figured that out, but how do you increment up a minor version?
>
> The version was specified by the path of the initial 'svn checkout'.
> Afterwards, any changes to that branch are included when an 'svn update'
> is run.
>
> https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/svn.html

Oops, I misunderstood your question.  To switch to a different branch, 
like from 10.0 to 10.1, use 'svn switch'.  (See 'svn help switch'.)