From owner-freebsd-questions@FreeBSD.ORG Tue Jan 20 00:56:47 2015 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E2B69553 for ; Tue, 20 Jan 2015 00:56:47 +0000 (UTC) Received: from mx02.qsc.de (mx02.qsc.de [213.148.130.14]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A07EB34C for ; Tue, 20 Jan 2015 00:56:47 +0000 (UTC) Received: from r56.edvax.de (port-92-195-61-84.dynamic.qsc.de [92.195.61.84]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx02.qsc.de (Postfix) with ESMTPS id 511BA2778D; Tue, 20 Jan 2015 01:56:39 +0100 (CET) Received: from r56.edvax.de (localhost [127.0.0.1]) by r56.edvax.de (8.14.5/8.14.5) with SMTP id t0K0uaqA002277; Tue, 20 Jan 2015 01:56:38 +0100 (CET) (envelope-from freebsd@edvax.de) Date: Tue, 20 Jan 2015 01:56:36 +0100 From: Polytropon To: Chris Maness Subject: Re: Mergemaster with Freebsd-Update Message-Id: <20150120015636.8664f310.freebsd@edvax.de> In-Reply-To: References: Reply-To: Polytropon Organization: EDVAX X-Mailer: Sylpheed 3.1.1 (GTK+ 2.24.5; i386-portbld-freebsd8.2) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: "freebsd-questions@freebsd.org" X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Jan 2015 00:56:48 -0000 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, ...