From owner-freebsd-current@FreeBSD.ORG  Tue Jun  5 23:12:33 2007
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
X-Original-To: freebsd-current@FreeBSD.org
Delivered-To: freebsd-current@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 797B516A400
	for <freebsd-current@FreeBSD.org>; Tue,  5 Jun 2007 23:12:33 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4])
	by mx1.freebsd.org (Postfix) with SMTP id 2023B13C457
	for <freebsd-current@FreeBSD.org>; Tue,  5 Jun 2007 23:12:33 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: (qmail 24434 invoked by uid 399); 5 Jun 2007 23:12:32 -0000
Received: from localhost (HELO lap.dougb.net) (dougb@dougbarton.us@127.0.0.1)
	by localhost with SMTP; 5 Jun 2007 23:12:32 -0000
X-Originating-IP: 127.0.0.1
Message-ID: <4665EDDE.90306@FreeBSD.org>
Date: Tue, 05 Jun 2007 16:12:30 -0700
From: Doug Barton <dougb@FreeBSD.org>
Organization: http://www.FreeBSD.org/
User-Agent: Thunderbird 2.0.0.0 (X11/20070525)
MIME-Version: 1.0
To: Kevin Oberman <oberman@es.net>
References: <20070605182948.E31B845042@ptavv.es.net>
In-Reply-To: <20070605182948.E31B845042@ptavv.es.net>
X-Enigmail-Version: 0.95.0
OpenPGP: id=D5B2F0FB
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: freebsd-current@FreeBSD.org, Neil Short <neshort@yahoo.com>
Subject: Re: xorg 7.2 & environment variables set in login.conf
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: Tue, 05 Jun 2007 23:12:33 -0000

Kevin Oberman wrote:

>> I suppose the real moral to the story is: be very
>> careful what you overwrite during mergemaster. It's my
>> guess that I overwrote /etc/login.conf at some point
>> when my eyes were glassed over.

mergemaster doesn't touch /etc/login.conf*, but that does not rule out
the "eyes glazed over" part. :)

> And 'mergemaster -U' is probably your best friend for letting you be
> very, very careful without spending all day doing the merge.

I'm glad that people are finding this feature that Gordon added useful.

Doug

-- 

    This .signature sanitized for your protection