Re: False conflict with interleaved merge commits

From: Stefan Sperling <stsp_at_elego.de>
Date: Sat, 8 Feb 2020 10:14:01 +0100

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
Received on 2020-02-08 10:14:16 CET

This message: [ Message body ]
Next message: Niko Paltzer: "empty result for svnadmin lstxns although there is a large rev-file in txn-protorevs"
Previous message: Stefan Sperling: "Re: False conflict with interleaved merge commits"
In reply to: Stefan Sperling: "Re: False conflict with interleaved merge commits"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]