Date: Fri, 10 Jul 2020 12:21:19 -0700 From: "Simon J. Gerraty" <sjg@juniper.net> To: "Rodney W. Grimes" <freebsd-rwg@gndrsh.dnsmgr.net> Cc: =?UTF-8?Q?Stefan_E=C3=9Fer?= <se@freebsd.org>, FreeBSD Hackers <freebsd-hackers@freebsd.org>, <sjg@juniper.net> Subject: Re: Huge mergeinfo list after merge from vendor branch Message-ID: <64190.1594408879@kaos.jnpr.net> In-Reply-To: <202007101640.06AGeloK096110@gndrsh.dnsmgr.net> References: <202007101640.06AGeloK096110@gndrsh.dnsmgr.net>
next in thread | previous in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?64190.1594408879>