From owner-svn-src-all@FreeBSD.ORG Sat Jun 21 01:00:22 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from hub.FreeBSD.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 89E56339; Sat, 21 Jun 2014 01:00:21 +0000 (UTC) Date: Fri, 20 Jun 2014 21:00:18 -0400 From: Glen Barber To: Justin Hibbits Subject: Re: svn commit: r267684 - in stable/9: . usr.sbin Message-ID: <20140621010018.GL1218@hub.FreeBSD.org> References: <201406201807.s5KI755X045471@svn.freebsd.org> <20140621003400.GJ1218@hub.FreeBSD.org> <20140620175034.1ed119db@zhabar.att.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Og24Z7r1sh+tVSZX" Content-Disposition: inline In-Reply-To: <20140620175034.1ed119db@zhabar.att.net> X-Operating-System: FreeBSD 11.0-CURRENT amd64 X-SCUD-Definition: Sudden Completely Unexpected Dataloss X-SULE-Definition: Sudden Unexpected Learning Event User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, Devin Teske , 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:00:22 -0000 --Og24Z7r1sh+tVSZX Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jun 20, 2014 at 05:50:34PM -0700, Justin Hibbits wrote: > On Fri, 20 Jun 2014 20:34:00 -0400 > Glen Barber wrote: >=20 > > On Fri, Jun 20, 2014 at 06:07:05PM +0000, Devin Teske wrote: > > > Author: dteske > > > Date: Fri Jun 20 18:07:04 2014 > > > New Revision: 267684 > > > URL: http://svnweb.freebsd.org/changeset/base/267684 > > >=20 > > > Log: > > > Add missing mergeinfo for 267683. > > >=20 > > > Modified: > > > Directory Properties: > > > stable/9/ (props changed) > > > stable/9/usr.sbin/ (props changed) > >=20 > > This looks wrong. Why is there mergeinfo to the root of the branch? > >=20 > > Glen > >=20 >=20 > I think that may be my doing in part. I MFC'd something a couple months > back, forgetting about the differences between 10 and older. >=20 No, he explicitly merged to the root of stable/9, which is wrong, regardless of if you did similar. Glen --Og24Z7r1sh+tVSZX Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJTpNkiAAoJELls3eqvi17QGg0QAJgmJyEwN3iY7kqq2f9DZmYn E0lzEON6R0JnW0/UBAM0vTiT9B+jvjWoT1tzkcbqc3PxRXviflaEJKxwYAjCKuKp TztiVd6pcB8ad/2Jhb5M6k/nGlC/y31B93dIPf+LY3Ir3Zy8ODH0jD+YkkKFnIBF 5ZFfH253q60gCcR7pNRkBOkydLDZFrjw4gVLuYrQ0JmbojP/5D0fOIFZeSgjlxvL LXDrVnFQCdgGW2sbewKGPsAQVN4RskKagUK6xnPm9AA1Nq3SeUj58VqxoXyrFoDc SWHyRcOuMVzOFTf0ZdUwn9KcHoTsbBjuakfP7KhIfSxuqwBCvpvGQYS8h8xsSGd9 AsyMG/XZHodk5EiluO4PHDda/NLPXLI7DNnsGC3qYxltncwCcn/PzH/97LFlH3Du KgDveEwsqYyIJsIYQ8dsdarnIJCG5Aja4Ea1iL5SqXzh0YbH5u8Qi+gWw5vWY/7d 0mDHoXSOLSNHYF/EAQGz54BbfaQaxpng4210s+IlTWjRSPHH1T5tF3D2I2MUX+Dg W1SI7EL0Rg7LZrlnggGKryAoF6+vTm0lFNqcTbe/srbeuPbWaaUXLpXUeCimtVwO oUDa9AqQM0jRtwsUyTzM33nEH8H+upPJ0fwhBgyGyF3wkObQFMlxaf311FP68qxr 3dO8GRU5rAcl3+a7dy9V =Yzd4 -----END PGP SIGNATURE----- --Og24Z7r1sh+tVSZX--