Date: Fri, 20 Jun 2014 22:25:33 -0400 From: Glen Barber <gjb@FreeBSD.org> To: dteske@FreeBSD.org Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org Subject: Re: svn commit: r267684 - in stable/9: . usr.sbin Message-ID: <20140621022533.GR1218@hub.FreeBSD.org> In-Reply-To: <01f101cf8cf2$c22877c0$46796740$@FreeBSD.org> References: <201406201807.s5KI755X045471@svn.freebsd.org> <20140621003400.GJ1218@hub.FreeBSD.org> <01b801cf8cef$2332d500$69987f00$@FreeBSD.org> <20140621012547.GO1218@hub.FreeBSD.org> <01f101cf8cf2$c22877c0$46796740$@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--ISCXPd1dR6/8kjof Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jun 20, 2014 at 06:47:28PM -0700, Devin Teske wrote: >=20 > > On Fri, Jun 20, 2014 at 06:21:32PM -0700, Devin Teske wrote: > > > Because we've been told to only ever merge things to the root of a > > > stable branch. > > > > >=20 > > Only for stable/10 and later. The stable/9 branch and earlier are merg= ed > the > > "old way." > >=20 >=20 > Crap. Sorry 'bout that then. So many different scenarios ;( I've reverted the bogus mergeinfo in r267702. Glen --ISCXPd1dR6/8kjof Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJTpO0dAAoJELls3eqvi17QlMYP/2grEFL2fOQVky3KJeBtIoE9 8k7pzcdG/DV7tkh+rZglLxcTOOn2uaUK5GACpoX9t0ZRZA62jGAMo3HARbSVUVHb AS4gAcNMbAVioT489YtlFeBkqQvVT2OttcJnJoGqzTea1Qqqt3dT/6xb8qkuMkOb Ano1OI6hzl5nKFjGwo8R59FTMC7cxPIDKhVfJHWhapSHtf/EJLAa8C4L1jgX5h3o 0eoVIdSfG+GiyVxeFXDMnMgdBTFPBt2gnvY2f4S8R3+GSuPlIyJPDW9lL5uh0xkx JJJU+oZrVDdfEx+bXfRp5fb2/VlEDFizgFNWCWpTvrSt39lDKHBN+htI/y/tH1Aa x48WvmugxZSXvCOcY9aWbD7+FIhp5qOKqtlAlUFVGGhYyLEvOKNGIXuLCNQt2oC8 JiiNxUZqGzx41PqXjAMDxaYcGrtOGwKuLr6svEl5CEHXz3YRhMs3sikbR2skhLii 4XQOzgUNBdY9zjuwcfZYr8HV4UgdIUEPosVWBI+54CR0Yp7IlvIeAJgb0Jd7GptN lOhYZjzevGOOxdLqAw47Bpm29Rr2T3xNlJwYseHm48fQC9ylGvtr+U566NOTKrQ3 81/VHU8t5X4MATBcJD7AT0T8xyHIiJsF+Gto5pLGEwaLiBgTrjMMJKIZTYWMPJK5 1I61CCmpnKl8uC+RGFt0 =qGXI -----END PGP SIGNATURE----- --ISCXPd1dR6/8kjof--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140621022533.GR1218>