From owner-freebsd-stable@FreeBSD.ORG Tue Mar 10 17:55:10 2015 Return-Path: Delivered-To: freebsd-stable@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 04EED8E9 for ; Tue, 10 Mar 2015 17:55:10 +0000 (UTC) Received: from mail-pa0-x233.google.com (mail-pa0-x233.google.com [IPv6:2607:f8b0:400e:c03::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C989566E for ; Tue, 10 Mar 2015 17:55:09 +0000 (UTC) Received: by pablj1 with SMTP id lj1so4030723pab.10 for ; Tue, 10 Mar 2015 10:55:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=l6QJ5e4Z16XFFhvaj0nHrNzi/dMx38iCUAPbiFpIe3U=; b=pHK2vkWcgd4s4+yzIX8ThExnolCA5mrX6fvKMF6zar3+MNch/gXSrFv1Fz+bkK8hab R5IQZXkZ5z5b+vbVPJHncCLgA404FXJ6t/l1RjhwtJccJ6hYEkk72dbdkyRyRaav5Bta +xKas41DQ4dC8JZwl5ldt9Pm07imbyFjsoN0x4FcPPxEBcoCXhP929a5e49A4AcLWdOJ Q4Y6s+87jJjSIdh+Yfcqnot0eA6CrfV/Cfj7J8MQuueFZGMrk9hx7UwiYAC+ZxGXX2kT bCJNAQrCh6RnX5DbLkVaapQazFb5I6HJB0DdQ3zpOFNOUXs9fZNme3QfNblyXLNxEsLM ub5w== MIME-Version: 1.0 X-Received: by 10.70.28.130 with SMTP id b2mr69574030pdh.48.1426010109245; Tue, 10 Mar 2015 10:55:09 -0700 (PDT) Received: by 10.70.79.166 with HTTP; Tue, 10 Mar 2015 10:55:09 -0700 (PDT) In-Reply-To: <20150310174554.GB9442@pol-server.leissner.se> References: <20150310120540.GN8223@pol-server.leissner.se> <20150310174554.GB9442@pol-server.leissner.se> Date: Tue, 10 Mar 2015 12:55:09 -0500 Message-ID: Subject: Re: There has to be a better way of merging /etc during a major freebsd-update From: Adam Vande More To: Peter Olsson Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1 Cc: "freebsd-stable@freebsd.org" X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2015 17:55:10 -0000 On Tue, Mar 10, 2015 at 12:45 PM, Peter Olsson < list-freebsd-stable@jyborn.se> wrote: > On Tue, Mar 10, 2015 at 10:17:18AM -0500, Adam Vande More wrote: > > On Tue, Mar 10, 2015 at 7:05 AM, Peter Olsson < > list-freebsd-stable@jyborn.se > > > wrote: > > > > > This flag to mergemaster saved a lot of work when I did > > > upgrades the old way, with cvsup and the make steps and > > > then mergemaster: > > > > > > > https://svnweb.freebsd.org/base?view=revision&revision=221780 > > > > I'd venture to guess the script will work fine on older installs, but > > testing should be done first. > > > > -- > > Adam > > This seems like an excellent addition fo freebsd-update, > how come it isn't added? > It is added, no flag needed. You are running a version of freebsd-update which didn't have the feature(8.4). -- Adam