From owner-freebsd-current@FreeBSD.ORG  Mon Mar 29 21:45:00 2004
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 14A7516A4DC; Mon, 29 Mar 2004 21:45:00 -0800 (PST)
Received: from smtp.omnis.com (smtp.omnis.com [216.239.128.26])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 036CF43D39; Mon, 29 Mar 2004 21:45:00 -0800 (PST)
	(envelope-from wes@softweyr.com)
Received: from softweyr.homeunix.net (66-91-236-204.san.rr.com
	[66.91.236.204])	by smtp-relay.omnis.com (Postfix) with ESMTP
	id EF2701880C19; Mon, 29 Mar 2004 21:44:58 -0800 (PST)
From: Wes Peters <wes@softweyr.com>
Organization: Softweyr.COM
To: freebsd-current@freebsd.org
Date: Fri, 19 Mar 2004 22:49:52 -0800
User-Agent: KMail/1.6.1
References: <200403170805.24990.ben@spooty.net>
	<20040318161144.F3876@qbhto.arg>
In-Reply-To: <20040318161144.F3876@qbhto.arg>
MIME-Version: 1.0
Content-Disposition: inline
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Message-Id: <200403192249.52193.wes@softweyr.com>
X-Mailman-Approved-At: Tue, 30 Mar 2004 05:21:56 -0800
cc: Ben Paley <ben@spooty.net>
cc: "freebsd -current@" <freebsd-current@freebsd.org>
Subject: Re: ok, I give in - proxy user
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
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, 30 Mar 2004 05:45:00 -0000

On Thursday 18 March 2004 16:12, Doug Barton wrote:
> On Wed, 17 Mar 2004, Ben Paley wrote:
> > Hello,
> >
> > I've read UPDATING and done what it said, but this is what happens to me:
>
> For future reference, running 'mergemaster -p' instead of manually
> adding the user(s)/group(s) will walk you through all the right steps.

Just make sure you're at least HALF awake when you do the merge...

-- 

        Where am I, and what am I doing in this handbasket?

Wes Peters                                               wes@softweyr.com