Re: svn MFC to stable/8
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 ___ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to freebsd-current-unsubscr...@freebsd.org
svn MFC to stable/8
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. ___ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to freebsd-current-unsubscr...@freebsd.org
Re: svn MFC to stable/8
On Thu, 2012-10-04 at 11:10 -0700, 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. ___ Can you post your attempted svn merge command? Sean ___ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to freebsd-current-unsubscr...@freebsd.org
Re: svn MFC to stable/8
Sean Bruno wrote: On Thu, 2012-10-04 at 11:10 -0700, 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. ___ Can you post your attempted svn merge command? Sean Same as I've always used. When at the top of an updated stable/8 checkout tree... # svn merge -c240720 svn+ssh://rmack...@svn.freebsd.org/base/head/sys sys Also, after I reverse merge via: # svn merge -c-240720 svn+ssh://rmack...@svn.freebsd.org/base/head/sys sys # svn status . M sys M sys/dev/sound - so I end up doing an rm -r of the tree, followed by a fresh checkout. (Before, the status wouldn't see anything modified after I would reverse the merge out.) rick ___ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to freebsd-current-unsubscr...@freebsd.org
Re: svn MFC to stable/8
On 4 October 2012 14:35, Rick Macklem rmack...@uoguelph.ca wrote: Sean Bruno wrote: On Thu, 2012-10-04 at 11:10 -0700, 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. ___ Can you post your attempted svn merge command? Sean Same as I've always used. When at the top of an updated stable/8 checkout tree... # svn merge -c240720 svn+ssh://rmack...@svn.freebsd.org/base/head/sys sys Also, after I reverse merge via: # svn merge -c-240720 svn+ssh://rmack...@svn.freebsd.org/base/head/sys sys # svn status . M sys M sys/dev/sound - so I end up doing an rm -r of the tree, followed by a fresh checkout. (Before, the status wouldn't see anything modified after I would reverse the merge out.) FYI you could just do svn revert -R, no need for rm -r svn merge -c240720 svn+ssh://svn.freebsd.org/base/head/sys stable8/sys worked for me. Note that lack of a '-' after the 'c' from 'svn help merge': If ARG is negative this is like -r ARG:ARG-1 -- Eitan Adler ___ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to freebsd-current-unsubscr...@freebsd.org
Re: svn MFC to stable/8
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. -- John Baldwin ___ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to freebsd-current-unsubscr...@freebsd.org
Re: svn MFC to stable/8
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. rick -- John Baldwin ___ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to freebsd-current-unsubscr...@freebsd.org ___ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to freebsd-current-unsubscr...@freebsd.org
