Date: Fri, 20 Jun 2014 19:26:14 -0700 From: <dteske@FreeBSD.org> To: "'Glen Barber'" <gjb@FreeBSD.org>, <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: <020901cf8cf8$2e95a1d0$8bc0e570$@FreeBSD.org> In-Reply-To: <20140621022533.GR1218@hub.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> <20140621022533.GR1218@hub.FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> -----Original Message----- > From: owner-src-committers@freebsd.org [mailto:owner-src- > committers@freebsd.org] On Behalf Of Glen Barber > Sent: Friday, June 20, 2014 7:26 PM > To: dteske@FreeBSD.org > Cc: src-committers@freebsd.org; svn-src-all@freebsd.org; svn-src- > stable@freebsd.org; svn-src-stable-9@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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?020901cf8cf8$2e95a1d0$8bc0e570$>