[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Possible bug in conflict resolver

From: Jonathan Guy <jonathan.guy_at_ikoder.com>
Date: Tue, 12 Mar 2019 14:43:32 +0000

Hi all
Not sure if this is a bug or expected behaviour.

Using Subversion 1.11.1

Two people with separate checkouts working on the same file.
Person A edits a line and the renames the file and commits.
Person B edits the same line in the same file and then does an update.

The conflict resolver first flags the tree conflict which is resolved with a move and merge.
The subsequent merge then produces the second conflict.

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.

Regards
Jonathan
Received on 2019-03-12 15:43:55 CET

This is an archived mail posted to the Subversion Dev mailing list.