Date: Fri, 10 Jul 2020 16:50:32 -0700 (PDT) From: "Rodney W. Grimes" <freebsd-rwg@gndrsh.dnsmgr.net> To: Enji Cooper <yaneurabeya@gmail.com> Cc: "Simon J. Gerraty" <sjg@juniper.net>, "Rodney W. Grimes" <freebsd-rwg@gndrsh.dnsmgr.net>, FreeBSD Hackers <freebsd-hackers@freebsd.org> Subject: Re: Huge mergeinfo list after merge from vendor branch Message-ID: <202007102350.06ANoWK5097419@gndrsh.dnsmgr.net> In-Reply-To: <92E891A1-0F43-458D-9B73-1011C81AFCBE@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
> > > 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007102350.06ANoWK5097419>