Re: Issues while building subversion-1.10.2 on RHEL6

On Thu, Feb 6, 2020 at 1:44 AM Karthik Sonti wrote: > Hello Team, > > > I was facing an issue while building subversion-1.10.2 on el6. I'm using > source from here > . > I'm attaching error logs also. > > Le

False conflict with interleaved merge commits

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

Re: False conflict with interleaved merge commits

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

Re: False conflict with interleaved merge commits

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