Date: Tue, 10 Dec 2013 19:24:48 -0500 From: Eitan Adler <lists@eitanadler.com> To: Rick Macklem <rmacklem@uoguelph.ca> Cc: freebsd-current <freebsd-current@freebsd.org> Subject: Re: svn merge to stable/10 has lotsa mergeinfo Message-ID: <CAF6rxgm8KOKedpN0gmdU3YxrGjnckkRz66jj5aJs49zY2-QAAg@mail.gmail.com> In-Reply-To: <2147336908.28920849.1386720284423.JavaMail.root@uoguelph.ca> References: <2147336908.28920849.1386720284423.JavaMail.root@uoguelph.ca>
next in thread | previous in thread | raw e-mail | index | archive | help
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. -- Eitan Adler
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAF6rxgm8KOKedpN0gmdU3YxrGjnckkRz66jj5aJs49zY2-QAAg>