svn commit: r267684 - in stable/9: . usr.sbin

[dteske at FreeBSD.org]

> -----Original Message-----
> From: owner-src-committers at freebsd.org [mailto:owner-src-
> committers at freebsd.org] On Behalf Of Glen Barber
> Sent: Friday, June 20, 2014 7:26 PM
> To: dteske at FreeBSD.org
> Cc: src-committers at freebsd.org; svn-src-all at freebsd.org; svn-src-
> stable at freebsd.org; svn-src-stable-9 at freebsd.org
> Subject: Re: svn commit: r267684 - in stable/9: . usr.sbin
> 
> On Fri, Jun 20, 2014 at 06:47:28PM -0700, Devin Teske wrote:
> >
> > > 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.
> > > >
> > >
> > > Only for stable/10 and later.  The stable/9 branch and earlier are
> > > merged
> > the
> > > "old way."
> > >
> >
> > Crap. Sorry 'bout that then. So many different scenarios ;(
> 
> I've reverted the bogus mergeinfo in r267702.
> 

Much thanks.
-- 
Cheers,
Devin