From owner-freebsd-current@FreeBSD.ORG Sat Oct 29 03:15:38 2011 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A6B2C106566C; Sat, 29 Oct 2011 03:15:38 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-yw0-f54.google.com (mail-yw0-f54.google.com [209.85.213.54]) by mx1.freebsd.org (Postfix) with ESMTP id 503B18FC12; Sat, 29 Oct 2011 03:15:37 +0000 (UTC) Received: by ywt32 with SMTP id 32so5586125ywt.13 for ; Fri, 28 Oct 2011 20:15:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=nDUrGJjUdF+45sxlQc2nqP+Nd/BjRkYdvDuhurnpinM=; b=apxxhoS/ydbDZdMC/xsM+qlWNrafcwJDrNZZLdkTtPHAOECxIdaC7hydx+D08lDMgz AO6MN66SqhTpuFYS1t3/sFwNkoM0oz9DZgf/eA4PtCz5rLM4rmClys8Abq3/Hkkf00Od S/OVVEbLwzLVNibDd+OjkTCC3jGpeMf1v2UEA= MIME-Version: 1.0 Received: by 10.182.111.70 with SMTP id ig6mr1198127obb.6.1319858137342; Fri, 28 Oct 2011 20:15:37 -0700 (PDT) Received: by 10.182.122.33 with HTTP; Fri, 28 Oct 2011 20:15:37 -0700 (PDT) In-Reply-To: References: <20111027102208.88BFB106564A@hub.freebsd.org> <20111028084329.134A0106566C@hub.freebsd.org> <4EAB5823.5090804@FreeBSD.org> Date: Fri, 28 Oct 2011 20:15:37 -0700 Message-ID: From: Garrett Cooper To: Kevin Oberman Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Thomas Mueller , Doug Barton , freebsd-current@freebsd.org Subject: Re: Upgrade from source to RC1: problems with /etc : lost users and dbus X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Oct 2011 03:15:38 -0000 On Fri, Oct 28, 2011 at 8:09 PM, Kevin Oberman wrote: > On Fri, Oct 28, 2011 at 6:34 PM, Doug Barton wrote: >> On 10/28/2011 01:43, Thomas Mueller wrote: >>> How does one run mergemaster without running roughshod over existing co= nfiguration? >> >> Carefully? :) =A0Seriously ... always use the -P option, and/or add >> PRESERVE_FILES in your mergemaster rc file. Watch the changes carefully. >> If you have to, do the updates in more than one pass using the -r option >> for subsequent runs. Do the simple ones first, then go back and do the >> ones that you have to think harder about. I recommend against using the >> -U option. >> >> It's not rocket science, it's just like any other system administration >> task, it requires careful attention. > > I agree that just running mergemaster CAREFULLY does the job. The only > time I was ever burned was when I was in a BIG hurry and ended up > wasting a LOT of time. (I think I also learned.) Of course, I also > remember merging /etc before we had mergemaster. > > I am a bit curious why you recommend against -U, though. I've been > using it since it was added and have never had a problems. It's saved > me quite a bit of time. Is thee a corner case that I'm missing? Here's a prime example (follow the white rabbit on this commit thread): http://lists.freebsd.org/pipermail/freebsd-current/2011-August/026= 310.html . Cheers, -Garrett