Huge mergeinfo list after merge from vendor branch
Rodney W. Grimes
freebsd-rwg at gndrsh.dnsmgr.net
Fri Jul 10 23:50:37 UTC 2020
>
> > On Jul 10, 2020, at 12:21 PM, Simon J. Gerraty via freebsd-hackers <freebsd-hackers at freebsd.org> wrote:
> >
> > Rodney W. Grimes <freebsd-rwg at gndrsh.dnsmgr.net> wrote:
> >> Was a merge done from the wrong working directory?
> >> Merges need to be done while cwd is the top level of the src tree.
> >
> > Pretty sure the examples in the svn primer show
> >
> > cd contrib/foo
> > svn merge ^/vendor/FOO/foo/dist .
> >
> > if that's not correct, and update would be useful.
>
> Hi,
> What sjg@ pointed out is the proper way to handle vendor updates/imports.
> Thanks so much!
I wonder if it is because of a svn copy that was done to
originally create contrib/foo rather than an svn merge?
--
Rod Grimes rgrimes at freebsd.org
More information about the freebsd-hackers
mailing list