svn merge to stable/10 has lotsa mergeinfo

[Eitan Adler]

On Wed, Dec 11, 2013 at 8:53 AM, Julian Elischer <julian at freebsd.org> wrote:
> On 12/11/13, 8:24 AM, Eitan Adler wrote:
>>
>> On Tue, Dec 10, 2013 at 7:04 PM, Rick Macklem <rmacklem at uoguelph.ca>
>> wrote:
>>>
>>> Hi,
>>>
>>> I just tried to MFC into stable/10 and it worked, but with
>>> a lot of mergeinfo. I know diddly about svn, so is this ok?
>>
>> Starting with stable/10 and later you must merge into the *root*, not into
>> sys/.
>>
>> P.S., with svn, it can be very helpful to provide the exact commands you
>> used.
>>
>>
>>
> so how about you tell people what you call root?  base? releng? 8? sys?  the
> place you did the checkout to?

Details here: http://www.freebsd.org/doc/en/articles/committers-guide/article.html#merge

If this not clear please let me know.


-- 
Eitan Adler