From owner-freebsd-stable@FreeBSD.ORG  Wed Oct 31 03:35:23 2012
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 1540D5C9;
 Wed, 31 Oct 2012 03:35:23 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from onyx.glenbarber.us (onyx.glenbarber.us
 [IPv6:2607:fc50:1000:c200::face])
 by mx1.freebsd.org (Postfix) with ESMTP id D8D008FC08;
 Wed, 31 Oct 2012 03:35:22 +0000 (UTC)
Received: from glenbarber.us (nucleus.glenbarber.us
 [IPv6:2001:470:8:1205:2:2:0:100])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested) (Authenticated sender: gjb)
 by onyx.glenbarber.us (Postfix) with ESMTPSA id D263523F645;
 Tue, 30 Oct 2012 23:35:21 -0400 (EDT)
Date: Tue, 30 Oct 2012 23:35:19 -0400
From: Glen Barber <gjb@FreeBSD.org>
To: Andreas Nilsson <andrnils@gmail.com>
Subject: Re: make release fails on find
Message-ID: <20121031033519.GI1371@glenbarber.us>
References: <20121030160804.GB1371@glenbarber.us>
 <CAPS9+SsUijoe6-4mY-LeZAP4geRG_KfObwtWJxP_0=Dkm9bW4Q@mail.gmail.com>
 <20121030170916.GD1371@glenbarber.us>
 <CAPS9+SuLH0Q+xPVHCEHuSEnPTpTsKs0YOnNkxgav-ppQDg+vVQ@mail.gmail.com>
 <CAPS9+Stn30yqnPaZRu7mY8NXExgr5vTDbmdGNmD2+_xfmmdTEg@mail.gmail.com>
 <20121030231412.GE1371@glenbarber.us>
 <CAPS9+SuASy6ojFaLkTe3e54qeHt8HdQ+gvYwgr+i7zXcYdsLFg@mail.gmail.com>
 <20121031001115.GF1371@glenbarber.us>
 <20121031030724.GG1371@glenbarber.us>
 <20121031031912.GH1371@glenbarber.us>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="81JctsDUVPekGcy+"
Content-Disposition: inline
In-Reply-To: <20121031031912.GH1371@glenbarber.us>
X-Operating-System: FreeBSD 10.0-CURRENT amd64
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: FreeBSD Stable Mailing List <freebsd-stable@freebsd.org>
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 31 Oct 2012 03:35:23 -0000


--81JctsDUVPekGcy+
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Tue, Oct 30, 2012 at 11:19:12PM -0400, Glen Barber wrote:
> So, please also do:
>=20
>     svn merge -c241451 ^/head/release release
>=20

You'll want to merge one more revision:

    svn merge -c241596 ^/head/release release

Same as before - I _think_ this should work. :-)

Glen


--81JctsDUVPekGcy+
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)

iQEcBAEBCAAGBQJQkJx3AAoJEFJPDDeguUajKtQIAI0Hs4iWHSGwA6vxCHY8Qjyn
vDYa+EMVE11nYkiS36QwYiE5EkyYT27SvsDmYhOnwgnXchB+w8JPXw5vTRQ+QYEu
Fg7/BhRMehdOYio8D3JBvFvTgjCqw5MeAlZN3F+R7utE/D4WwkaaiQbe5hA/eeuV
qMWPSiGINZ1Y8U5YwFpfkF7q2qCHFH2D64DvqIlARFCOMNm7PYn2WI2vjPuv17rx
Ag8Vqgs6JKiNQowyyizHAuOEs4kZtinGzaiUVlNR5pP1zmAE3LvsrXWk+pM9u/dW
MxjC6O2sVmfzDP+dTOdUsnPMtscDQIXiy4pRga9PeInw+gHE0WWdcHIe7MSyZAw=
=aKhm
-----END PGP SIGNATURE-----

--81JctsDUVPekGcy+--