svn commit: r254966 - stable/9/usr.sbin

[Devin Teske]

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=http://svnweb.freebsd.org/changeset/base/254966&k=%2FbkpAUdJWZuiTILCq%2FFnQg%3D%3D%0A&r=Mrjs6vR4%2Faj2Ns9%2FssHJjg%3D%3D%0A&m=liaz95fhD2jvIKdlVPU7U5L5wSUmvhBIn55r4kCXnMQ%3D%0A&s=c379f1e4272fc0b90042e434234eaeb4a6ec9a169fefc38babe82b5556cdd358
>> 
>> Log:
>>  Add missing mergeinfo from head for stabe/9 revisions: 252995 253168 253169
>> 
>> Modified:
>> Directory Properties:
>>  stable/9/usr.sbin/   (props changed)
>>  stable/9/usr.sbin/Makefile   (props changed)
>>  stable/9/usr.sbin/bsdconfig/   (props changed)
> 
> 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.
> 

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-intuitive
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.
-- 
Devin

_____________
The information contained in this message is proprietary and/or confidential. If you are not the intended recipient, please: (i) delete the message and all copies; (ii) do not disclose, distribute or use the message in any manner; and (iii) notify the sender immediately. In addition, please be aware that any message addressed to our domain is subject to archiving and review by persons other than the intended recipient. Thank you.