Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 20 Jan 2015 01:56:36 +0100
From:      Polytropon <freebsd@edvax.de>
To:        Chris Maness <chris@chrismaness.com>
Cc:        "freebsd-questions@freebsd.org" <freebsd-questions@freebsd.org>
Subject:   Re: Mergemaster with Freebsd-Update
Message-ID:  <20150120015636.8664f310.freebsd@edvax.de>
In-Reply-To: <CANnsUMEF9h+fgTP2y0cu3m=Fs3iOgR9cPAYodgXrOryxjV6Yog@mail.gmail.com>
References:  <CANnsUMEF9h+fgTP2y0cu3m=Fs3iOgR9cPAYodgXrOryxjV6Yog@mail.gmail.com>

Next in thread | Previous in thread | Raw E-Mail | Index | Archive | Help
On Mon, 19 Jan 2015 11:27:45 -0800, Chris Maness wrote:
> I much prefer mergemaster to the freebsd-update (diff) method of merging
> configuration files.  However, the freebsd community seems to be moving in
> the binary upgrade direction.  I still build from source so that I can use
> mergemaster.  Where can I make a feature request to have mergemaster as an
> option in a freebsd-update (binary) upgrade?

You can probably tune freebsd-update to fit your needs better.
Have a look at "man freebsd-update.conf" and check the 
"UpdateIfUnmodified" and "MergeChanges" options.



> Also, is the a tool like portsnap for my source tree?

At the moment, there is no such tool, as far as I know.



> I used svn the last
> time and downloaded the whole version 10.0 tree.

This is because svn needs to initialize the local copy of
the source tree. This is only required one time (svn checkout).
Any further updates are usually done quickly (svn update),
depending on how big the delta is.



> 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.

You can find a good description here:

https://www.freebsd.org/doc/handbook/svn.html



> I know that svn has that capability like cvsup did, but I
> have not been able to figure it out.

Unlike cvs, svn needs to "start from scratch" to work
properly. Previously, it has been possible to download
src.txz (the compressed RELEASE source archive) and then
just apply the changes (for example, from RELEASE to the
current patch level, or to the recent STABLE version).
This is also possible with svn, but you need to checkout
the initial version first. If you want to switch to a
different branch, use "svn switch" (for example, from
10.0 to 10.1).


-- 
Polytropon
Magdeburg, Germany
Happy FreeBSD user since 4.0
Andra moi ennepe, Mousa, ...



Want to link to this message? Use this URL: <http://docs.FreeBSD.org/cgi/mid.cgi?20150120015636.8664f310.freebsd>