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
> in
On Sat, Feb 08, 2020 at 04:01:06AM +, Daniel Shahaf wrote:
> That's the desired result, isn't it? If so, is there an underlying rule
> here that we could teach Subversion to follow automatically?
The underlying issue is a decision made by the "automatic merge" heuristic.
Note the output of t
