Date: Mon, 31 Jan 2011 12:43:54 +0000 From: Gavin Atkinson <gavin@FreeBSD.org> To: Alfred Perlstein <alfred@FreeBSD.org> 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 Message-ID: <1296477834.85782.8.camel@buffy.york.ac.uk> In-Reply-To: <201101290814.p0T8ElWG023548@svn.freebsd.org> References: <201101290814.p0T8ElWG023548@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 >=20 > Log: > MFC: 'alfred' command. >=20 > 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. Thanks, Gavin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1296477834.85782.8.camel>