From owner-svn-src-all@FreeBSD.ORG Sat Jun 21 01:47:31 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E285131B; Sat, 21 Jun 2014 01:47:31 +0000 (UTC) Received: from shxd.cx (unknown [64.201.244.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CAC6E20A1; Sat, 21 Jun 2014 01:47:31 +0000 (UTC) Received: from [50.204.88.51] (port=9353 helo=THEMADHATTER) by shxd.cx with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.77 (FreeBSD)) (envelope-from ) id 1Wy5q3-0009dl-Re; Fri, 20 Jun 2014 13:55:11 -0700 From: To: "'Glen Barber'" , References: <201406201807.s5KI755X045471@svn.freebsd.org> <20140621003400.GJ1218@hub.FreeBSD.org> <01b801cf8cef$2332d500$69987f00$@FreeBSD.org> <20140621012547.GO1218@hub.FreeBSD.org> In-Reply-To: <20140621012547.GO1218@hub.FreeBSD.org> Subject: RE: svn commit: r267684 - in stable/9: . usr.sbin Date: Fri, 20 Jun 2014 18:47:28 -0700 Message-ID: <01f101cf8cf2$c22877c0$46796740$@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Mailer: Microsoft Outlook 15.0 Thread-Index: AQErAWbqM8rUJx5hZJygkY9nwuIKKwJGzp4aAagaxDUBeACezZyYq0Ew Content-Language: en-us Sender: devin@shxd.cx Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jun 2014 01:47:32 -0000 > -----Original Message----- > From: owner-src-committers@freebsd.org [mailto:owner-src- > committers@freebsd.org] On Behalf Of Glen Barber > Sent: Friday, June 20, 2014 6: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: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 ;( -- Devin