svn commit: r218060 - stable/8/usr.sbin/portsnap/portsnap

[Gavin Atkinson]

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.

Thanks,

Gavin