From owner-svn-src-stable@FreeBSD.ORG Tue Aug 27 18:29:39 2013 Return-Path: Delivered-To: svn-src-stable@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 ESMTP id C81EF1EA; Tue, 27 Aug 2013 18:29:39 +0000 (UTC) (envelope-from Devin.Teske@fisglobal.com) Received: from mx1.fisglobal.com (mx1.fisglobal.com [199.200.24.190]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 915D329F9; Tue, 27 Aug 2013 18:29:39 +0000 (UTC) Received: from smtp.fisglobal.com ([10.132.206.17]) by ltcfislmsgpa01.fnfis.com (8.14.5/8.14.5) with ESMTP id r7RITcMT010789 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Tue, 27 Aug 2013 13:29:38 -0500 Received: from [10.0.0.100] (10.242.181.54) by smtp.fisglobal.com (10.132.206.17) with Microsoft SMTP Server (TLS) id 14.2.309.2; Tue, 27 Aug 2013 13:29:36 -0500 Subject: Re: svn commit: r254966 - stable/9/usr.sbin MIME-Version: 1.0 (Apple Message framework v1283) Content-Type: text/plain; charset="us-ascii" From: Devin Teske In-Reply-To: <20130827182700.GY49310@glenbarber.us> Date: Tue, 27 Aug 2013 11:29:28 -0700 Content-Transfer-Encoding: quoted-printable Message-ID: References: <201308271816.r7RIGooN060152@svn.freebsd.org> <20130827182700.GY49310@glenbarber.us> To: Glen Barber X-Mailer: Apple Mail (2.1283) X-Originating-IP: [10.242.181.54] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.10.8794, 1.0.431, 0.0.0000 definitions=2013-08-27_08:2013-08-27,2013-08-27,1970-01-01 signatures=0 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-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Devin Teske List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Aug 2013 18:29:39 -0000 On Aug 27, 2013, at 11:27 AM, Glen Barber wrote: > On Tue, Aug 27, 2013 at 06:16:50PM +0000, Devin Teske wrote: >> Author: dteske >> Date: Tue Aug 27 18:16:50 2013 >> New Revision: 254966 >> URL: https://urldefense.proofpoint.com/v1/url?u=3Dhttp://svnweb.freebsd.= org/changeset/base/254966&k=3D%2FbkpAUdJWZuiTILCq%2FFnQg%3D%3D%0A&r=3DMrjs6= vR4%2Faj2Ns9%2FssHJjg%3D%3D%0A&m=3Dliaz95fhD2jvIKdlVPU7U5L5wSUmvhBIn55r4kCX= nMQ%3D%0A&s=3Dc379f1e4272fc0b90042e434234eaeb4a6ec9a169fefc38babe82b5556cdd= 358 >>=20 >> Log: >> Add missing mergeinfo from head for stabe/9 revisions: 252995 253168 25= 3169 >>=20 >> Modified: >> Directory Properties: >> stable/9/usr.sbin/ (props changed) >> stable/9/usr.sbin/Makefile (props changed) >> stable/9/usr.sbin/bsdconfig/ (props changed) >=20 > This is wrong. usr.sbin should never be a merge target. The correct > merge targets in this case are usr.sbin/bsdconfig/share and > usr.sbin/bsdconfig. >=20 But but... (first... apologies) For clarification... How exactly would someone merge the mergeinfo for the usr.sbin/Makefile? In a separate commit? That seems (not arguing... but...) seems counter-intu= itive to require so much churn for a touch-up. Despite the fact that the commit was done in usr.sbin... The *merges* were actually done at the right level. --=20 Devin _____________ The information contained in this message is proprietary and/or confidentia= l. If you are not the intended recipient, please: (i) delete the message an= d all copies; (ii) do not disclose, distribute or use the message in any ma= nner; and (iii) notify the sender immediately. In addition, please be aware= that any message addressed to our domain is subject to archiving and revie= w by persons other than the intended recipient. Thank you.