From owner-svn-src-stable-8@FreeBSD.ORG  Tue Feb  1 00:23:46 2011
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C359B1065698;
	Tue,  1 Feb 2011 00:23:46 +0000 (UTC)
	(envelope-from bright@elvis.mu.org)
Received: from elvis.mu.org (elvis.mu.org [192.203.228.196])
	by mx1.freebsd.org (Postfix) with ESMTP id 9578F8FC12;
	Tue,  1 Feb 2011 00:23:46 +0000 (UTC)
Received: by elvis.mu.org (Postfix, from userid 1192)
	id 5D13F1A3C3A; Mon, 31 Jan 2011 16:06:35 -0800 (PST)
Date: Mon, 31 Jan 2011 16:06:35 -0800
From: Alfred Perlstein <alfred@freebsd.org>
To: Gavin Atkinson <gavin@FreeBSD.org>
Message-ID: <20110201000635.GK21872@elvis.mu.org>
References: <201101290814.p0T8ElWG023548@svn.freebsd.org>
	<1296477834.85782.8.camel@buffy.york.ac.uk>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1296477834.85782.8.camel@buffy.york.ac.uk>
User-Agent: Mutt/1.4.2.3i
Cc: svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org,
	src-committers@FreeBSD.org, svn-src-stable-8@FreeBSD.org
Subject: Re: svn commit: r218060 - stable/8/usr.sbin/portsnap/portsnap
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Feb 2011 00:23:46 -0000

> On Sat, 2011-01-29 at 08:14 +0000, Alfred Perlstein wrote:
> > Author: alfred
> > Date: Sat Jan 29 08:14:47 2011
> > New Revision: 218060
> > URL: http://svn.freebsd.org/changeset/base/218060
> > 
> > Log:
> >   MFC: 'alfred' command.
> > 
> > Modified:
> >   stable/8/usr.sbin/portsnap/portsnap/portsnap.sh
> 
> Hi,
> 
> Firstly, thanks for merging this, although it would be great if it could
> be given a better name.   Possibly the command should be called "auto".
> 
> This merge also appears to be missing the related mergeinfo.
> 
> You should be able to fix this with:
> cd stable/8/usr.sbin/portsnap
> svn merge --record-only -c 201251 $FBSD/usr.sbin/portsnap .
> 
> Then verify it looks correct with an "svn diff" before committing.

I'm fine with 'auto'.

Anyone object?

Also will do the mergehistory fixup.  Thank you for the quick howto.

-- 
- Alfred Perlstein
.- VMOA #5191, 03 vmax, 92 gs500, 85 ch250, 07 zx10
.- FreeBSD committer