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

Bug Report: "Resolve conflict on merge with locked files"

From: Christian Kirschner <Christian.Kirschner_at_CENARIO.de>
Date: Thu, 22 Dec 2016 02:57:40 -0800 (PST)

We are using TortoiseSVN 1.9.5. in our company. I use the merge function to merge changes from our trunk to a branch. When a conflict arises during the merge process a window comes up to resolve the conflict. I click on "Edit conflict" there. Then TortoiseMerge opens to resolve the conflict. When the conflict is solved I want to save with the "Save" button. If the conflicted file has the property "svn:needs-lock" the save button does not save my changes, but a "Save as"-Dialog comes up instead. This was not happen in the old version 1.8.12. I expect my changes to be saved so that I can click on "Resolved" afterwards and continue with the other files.

Thanks in advance
Christian Kirschner

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3198035

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2016-12-24 02:57:19 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.