Date: Wed, 11 Dec 2013 21:53:22 +0800 From: Julian Elischer <julian@freebsd.org> To: Eitan Adler <lists@eitanadler.com>, Rick Macklem <rmacklem@uoguelph.ca> Cc: freebsd-current <freebsd-current@freebsd.org> Subject: Re: svn merge to stable/10 has lotsa mergeinfo Message-ID: <52A86E52.3030502@freebsd.org> In-Reply-To: <CAF6rxgm8KOKedpN0gmdU3YxrGjnckkRz66jj5aJs49zY2-QAAg@mail.gmail.com> References: <2147336908.28920849.1386720284423.JavaMail.root@uoguelph.ca> <CAF6rxgm8KOKedpN0gmdU3YxrGjnckkRz66jj5aJs49zY2-QAAg@mail.gmail.com>
index | next in thread | previous in thread | raw e-mail
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? Experts always assume that everyone has the decoder rings.home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?52A86E52.3030502>