From owner-freebsd-questions@FreeBSD.ORG  Mon Jan 19 19:27:46 2015
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A8E5FFA7
 for <freebsd-questions@freebsd.org>; Mon, 19 Jan 2015 19:27:46 +0000 (UTC)
Received: from mail-ie0-x229.google.com (mail-ie0-x229.google.com
 [IPv6:2607:f8b0:4001:c03::229])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 6F11BBCC
 for <freebsd-questions@freebsd.org>; Mon, 19 Jan 2015 19:27:46 +0000 (UTC)
Received: by mail-ie0-f169.google.com with SMTP id rl12so9479852iec.0
 for <freebsd-questions@freebsd.org>; Mon, 19 Jan 2015 11:27:45 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:date:message-id:subject:from:to:content-type;
 bh=9g6Y75YMpSBE/zYXDq+1W8g5jW/HeKF1qDsfDVGT6NU=;
 b=PpaDEnBX8cZcnJw2F3gaaggmCjbt9qMy6T3NbSHLoAZa1dzgdcLCDsUI3smnaiTPHg
 SzhFKCIhumqoF+Ivo7YEfaj49H85XmVM3YYRsw8WbT/gJQ0J8OSo4QPoKgRJNE1oB6Qn
 /NQUvl6YInEkYiLnKnXI6nc2TC4s3jugHFWJd2fbWV+MWsWJ/wj0wIRApz0Z4sch1lrO
 3Ze4jV+lgD6fav7JhESNdQne0R3gYiEjRuvCWkIY/mZW6qVN+cpx8PCWtqdk71I4j1UE
 16GFZ1CXUsMgG4YBE/+LRrhSjsFHVSYX9nqo7h5YYxxDhDWm0HDKhPhNxOKbxFJLzvZi
 A2Kw==
MIME-Version: 1.0
X-Received: by 10.50.142.38 with SMTP id rt6mr21322004igb.39.1421695665799;
 Mon, 19 Jan 2015 11:27:45 -0800 (PST)
Sender: christopher.maness@gmail.com
Received: by 10.36.122.212 with HTTP; Mon, 19 Jan 2015 11:27:45 -0800 (PST)
Date: Mon, 19 Jan 2015 11:27:45 -0800
X-Google-Sender-Auth: b7ssb-oR7VGsTnazZz37z0s2JR4
Message-ID: <CANnsUMEF9h+fgTP2y0cu3m=Fs3iOgR9cPAYodgXrOryxjV6Yog@mail.gmail.com>
Subject: Mergemaster with Freebsd-Update
From: Chris Maness <chris@chrismaness.com>
To: "freebsd-questions@freebsd.org" <freebsd-questions@freebsd.org>
Content-Type: text/plain; charset=UTF-8
X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-questions>, 
 <mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions/>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
 <mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jan 2015 19:27:46 -0000

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?

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