svn merge to stable/10 has lotsa mergeinfo

Julian Elischer julian at freebsd.org
Wed Dec 11 13:53:43 UTC 2013


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?
Experts always assume that everyone has the decoder rings.



More information about the freebsd-current mailing list