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