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"
