Possible bug in conflict resolver
From: Jonathan Guy <jonathan.guy_at_ikoder.com>
Date: Tue, 12 Mar 2019 14:43:32 +0000
Using Subversion 1.11.1
Two people with separate checkouts working on the same file.
The conflict resolver first flags the tree conflict which is resolved with a move and merge.
Here’s were the behaviour is not what I expected. If I select “tf” so accepting all incoming changes I end up with a file that is resolved but is showing as modified. I check the contents and it contains my changes.
Conversely if I resolve using “mf” so rejecting incoming changes I end up with a file that is resolved but is showing as normal and is identical to the head version and I have lost all my changes.
I’m pretty sure this not the intended behaviour but I could be wrong.
This is an archived mail posted to the Subversion Dev mailing list.