Date: Tue, 30 Oct 2012 23:35:19 -0400 From: Glen Barber <gjb@FreeBSD.org> To: Andreas Nilsson <andrnils@gmail.com> Cc: FreeBSD Stable Mailing List <freebsd-stable@freebsd.org> Subject: Re: make release fails on find Message-ID: <20121031033519.GI1371@glenbarber.us> In-Reply-To: <20121031031912.GH1371@glenbarber.us> References: <20121030160804.GB1371@glenbarber.us> <CAPS9%2BSsUijoe6-4mY-LeZAP4geRG_KfObwtWJxP_0=Dkm9bW4Q@mail.gmail.com> <20121030170916.GD1371@glenbarber.us> <CAPS9%2BSuLH0Q%2BxPVHCEHuSEnPTpTsKs0YOnNkxgav-ppQDg%2BvVQ@mail.gmail.com> <CAPS9%2BStn30yqnPaZRu7mY8NXExgr5vTDbmdGNmD2%2B_xfmmdTEg@mail.gmail.com> <20121030231412.GE1371@glenbarber.us> <CAPS9%2BSuASy6ojFaLkTe3e54qeHt8HdQ%2BgvYwgr%2Bi7zXcYdsLFg@mail.gmail.com> <20121031001115.GF1371@glenbarber.us> <20121031030724.GG1371@glenbarber.us> <20121031031912.GH1371@glenbarber.us>
next in thread | previous in thread | raw e-mail | index | archive | help
--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+--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121031033519.GI1371>