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.