Date: Fri, 5 Oct 2012 11:46:33 -0400 From: John Baldwin <jhb@freebsd.org> To: Rick Macklem <rmacklem@uoguelph.ca> Cc: freebsd-current@freebsd.org Subject: Re: svn MFC to stable/8 Message-ID: <201210051146.33771.jhb@freebsd.org> In-Reply-To: <1794336473.1759341.1349388416433.JavaMail.root@erie.cs.uoguelph.ca> References: <1794336473.1759341.1349388416433.JavaMail.root@erie.cs.uoguelph.ca>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thursday, October 04, 2012 6:06:56 pm Rick Macklem wrote: > John Baldwin wrote: > > On Thursday, October 04, 2012 2:10:11 pm Rick Macklem wrote: > > > Hi, > > > > > > Hopefully someone familiar with svn can help. When I try to MFC > > > a kernel change to stable/8, it works, but I end up with tons of > > > mergeinfo. (It looks like every directory under sys.) > > > > > > Does this matter or is there a trick to avoid this? > > > > > > Thanks in advance for any help, rick > > > ps: I seem to MFC fine to stable/9. I only see this for stable/8. > > > > Someone screwed up the mergeinfo on stable/8/sys/dev due to svn 1.6 > > not working well with newer merges from 1.7. The simplest solution > > is to just update your client to svn 1.7. Otherwise, you can commit > > what you have now with 1.6. > > > Thanks yet again John. I used svn1.7 and it didn't have all the dirs. > It only listed directory properties for sys and sys/fs, > which I hope was ok, since I committed it. Yep. -- John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210051146.33771.jhb>