[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freebsd-hackers
Subject:    Re: Huge mergeinfo list after merge from vendor branch
From:       "Rodney W. Grimes" <freebsd-rwg () gndrsh ! dnsmgr ! net>
Date:       2020-07-10 23:50:32
Message-ID: 202007102350.06ANoWK5097419 () gndrsh ! dnsmgr ! net
[Download RAW message or body]

> 
> > On Jul 10, 2020, at 12:21 PM, Simon J. Gerraty via freebsd-hackers \
> > <freebsd-hackers@freebsd.org> wrote: 
> > Rodney W. Grimes <freebsd-rwg@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@freebsd.org
_______________________________________________
freebsd-hackers@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-hackers
To unsubscribe, send any mail to "freebsd-hackers-unsubscribe@freebsd.org"


[prev in list] [next in list] [prev in thread] [next in thread]