From owner-svn-src-all@FreeBSD.ORG Mon Jan 31 12:45:09 2011 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ADC581065672; Mon, 31 Jan 2011 12:45:09 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from ixe-mta-27.emailfiltering.com (ixe-mta-27-tx.emailfiltering.com [194.116.199.158]) by mx1.freebsd.org (Postfix) with ESMTP id 8D2538FC0C; Mon, 31 Jan 2011 12:45:06 +0000 (UTC) Received: from mail-gw12.york.ac.uk ([144.32.129.162]) by ixe-mta-27.emailfiltering.com with emfmta (version 4.8.0.417) by TLS id 908408518 for alfred@FreeBSD.org; b502b5bf35bd8498; Mon, 31 Jan 2011 12:43:56 +0000 Received: from buffy-128.york.ac.uk ([144.32.128.160]:21374 helo=buffy.york.ac.uk) by mail-gw12.york.ac.uk with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1Pjt6p-00065f-C0; Mon, 31 Jan 2011 12:43:55 +0000 Received: from buffy.york.ac.uk (localhost [127.0.0.1]) by buffy.york.ac.uk (8.14.4/8.14.4) with ESMTP id p0VChtUw086365; Mon, 31 Jan 2011 12:43:55 GMT (envelope-from gavin@FreeBSD.org) Received: (from ga9@localhost) by buffy.york.ac.uk (8.14.4/8.14.4/Submit) id p0VChts6086364; Mon, 31 Jan 2011 12:43:55 GMT (envelope-from gavin@FreeBSD.org) X-Authentication-Warning: buffy.york.ac.uk: ga9 set sender to gavin@FreeBSD.org using -f From: Gavin Atkinson To: Alfred Perlstein In-Reply-To: <201101290814.p0T8ElWG023548@svn.freebsd.org> References: <201101290814.p0T8ElWG023548@svn.freebsd.org> Content-Type: text/plain; charset="ASCII" Content-Transfer-Encoding: quoted-printable Date: Mon, 31 Jan 2011 12:43:54 +0000 Message-ID: <1296477834.85782.8.camel@buffy.york.ac.uk> Mime-Version: 1.0 X-Mailer: Evolution 2.32.1 FreeBSD GNOME Team Port 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-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jan 2011 12:45:09 -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 >=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