From owner-freebsd-current@FreeBSD.ORG  Sat Oct 29 01:34:40 2011
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35])
	by hub.freebsd.org (Postfix) with ESMTP id BAA90106566C
	for <freebsd-current@freebsd.org>; Sat, 29 Oct 2011 01:34:40 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from 172-17-198-245.globalsuite.net (hub.freebsd.org
	[IPv6:2001:4f8:fff6::36])
	by mx2.freebsd.org (Postfix) with ESMTP id 9653A15120F;
	Sat, 29 Oct 2011 01:34:27 +0000 (UTC)
Message-ID: <4EAB5823.5090804@FreeBSD.org>
Date: Fri, 28 Oct 2011 18:34:27 -0700
From: Doug Barton <dougb@FreeBSD.org>
Organization: http://SupersetSolutions.com/
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
	rv:7.0.1) Gecko/20111001 Thunderbird/7.0.1
MIME-Version: 1.0
To: Thomas Mueller <mueller6727@bellsouth.net>
References: <CAFHbX1+WPM0E+UGpKKVb8WoNyeYBOp5GdrF59E3sgRp1TM8VRg@mail.gmail.com>
	<20111027102208.88BFB106564A@hub.freebsd.org>
	<20111028084329.134A0106566C@hub.freebsd.org>
In-Reply-To: <20111028084329.134A0106566C@hub.freebsd.org>
X-Enigmail-Version: undefined
OpenPGP: id=1A1ABC84
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: 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
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Oct 2011 01:34:40 -0000

On 10/28/2011 01:43, Thomas Mueller wrote:
> How does one run mergemaster without running roughshod over existing configuration?

Carefully? :)  Seriously ... 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.


Doug

-- 

	Nothin' ever doesn't change, but nothin' changes much.
			-- OK Go

	Breadth of IT experience, and depth of knowledge in the DNS.
	Yours for the right price.  :)  http://SupersetSolutions.com/