Date: Wed, 11 Dec 2013 08:57:52 -0500 From: Eitan Adler <lists@eitanadler.com> To: Julian Elischer <julian@freebsd.org> Cc: Rick Macklem <rmacklem@uoguelph.ca>, freebsd-current <freebsd-current@freebsd.org> Subject: Re: svn merge to stable/10 has lotsa mergeinfo Message-ID: <CAF6rxgmLqcXjUN0zYudpJc=rzgfXhEA5mTDdN5iGFQ89=hg4ng@mail.gmail.com> In-Reply-To: <52A86E52.3030502@freebsd.org> References: <2147336908.28920849.1386720284423.JavaMail.root@uoguelph.ca> <CAF6rxgm8KOKedpN0gmdU3YxrGjnckkRz66jj5aJs49zY2-QAAg@mail.gmail.com> <52A86E52.3030502@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Dec 11, 2013 at 8:53 AM, Julian Elischer <julian@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@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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAF6rxgmLqcXjUN0zYudpJc=rzgfXhEA5mTDdN5iGFQ89=hg4ng>