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
Stefan Sperling wrote on Fri, 07 Feb 2020 08:44 +0100:
> Which is why I see no way to fix this in SVN itself.
> If we made SVN record r5 during the original merge (before r5 existed),
> that would be wrong.
> And if we made SVN skip A/mu edits from r5 during the conflicting merge,
> that would be w
On Feb 7, 2020, at 02:44, Stefan Sperling wrote:
>
> On Thu, Feb 06, 2020 at 03:37:10PM -0500, Daniel Dickison wrote:
>> Strangely, the conflict goes away if you flip the order of steps 2 and 3,
>> or commit the merge from step 4 first.
>
> I would say it is working as designed, but the design h
On Thu, Feb 06, 2020 at 03:37:10PM -0500, Daniel Dickison wrote:
> Strangely, the conflict goes away if you flip the order of steps 2 and 3,
> or commit the merge from step 4 first.
I would say it is working as designed, but the design has its flaws.
As you have found out, the basic problem is th
Here’s a similar one -
https://paulhammant.com/2015/10/05/subversion-merge-limitations-not-in-perforce/
On Fri, Feb 7, 2020 at 6:31 AM Daniel Dickison wrote:
> We think we’ve found a bug in Subversion’s conflict detection during merge
> operations that results in a false conflict. It occurs afte
We think we’ve found a bug in Subversion’s conflict detection during merge
operations that results in a false conflict. It occurs after two ‘merge’
commands are committed in reverse order between two branches, and then a
subsequent merge is attempted. I’ve attached a repro script that illustrate
