On Sat, Feb 08, 2020 at 09:57:47AM +0100, Stefan Sperling wrote: > So, indeed, if there was a way to extend the heuristic to detect this case > the problem could be avoided. I suspect the heuristic only ever looks at > server-side mergeinfo and does not take mergeinfo in the local working copy > into account? See client_find_automatic_merge() in libsvn_client/merge.c.
I have filed https://issues.apache.org/jira/projects/SVN/issues/SVN-4847
