Date: Fri, 10 Jul 2020 16:45:54 -0700 From: Enji Cooper <yaneurabeya@gmail.com> To: "Simon J. Gerraty" <sjg@juniper.net> Cc: "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: <92E891A1-0F43-458D-9B73-1011C81AFCBE@gmail.com> In-Reply-To: <64190.1594408879@kaos.jnpr.net> References: <202007101640.06AGeloK096110@gndrsh.dnsmgr.net> <64190.1594408879@kaos.jnpr.net>
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: >=20 > 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. >=20 > Pretty sure the examples in the svn primer show >=20 > cd contrib/foo > svn merge ^/vendor/FOO/foo/dist . >=20 > 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! -Enji=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?92E891A1-0F43-458D-9B73-1011C81AFCBE>