Date: Tue, 27 Aug 2013 11:29:28 -0700 From: Devin Teske <dteske@vicor.com> To: Glen Barber <gjb@FreeBSD.org> Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, Devin Teske <dteske@FreeBSD.org>, src-committers@freebsd.org, svn-src-stable-9@freebsd.org Subject: Re: svn commit: r254966 - stable/9/usr.sbin Message-ID: <A35984E9-A7AA-46F2-A989-486C9FE5E55A@vicor.com> In-Reply-To: <20130827182700.GY49310@glenbarber.us> References: <201308271816.r7RIGooN060152@svn.freebsd.org> <20130827182700.GY49310@glenbarber.us>
next in thread | previous in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?A35984E9-A7AA-46F2-A989-486C9FE5E55A>