kop...@gmail.com
unread,Jan 9, 2018, 11:29:14 AM1/9/18Sign in to reply to author
Sign in to forward
You do not have permission to delete messages in this group
Sign in to report message
Either email addresses are anonymous for this group or you need the view member email addresses permission to view the original message
to TortoiseSVN
Hello, couple of days ago I had upgraded to TortoiseSVN 1.9.7, Build 27907 - 64 Bit , 2017/08/08 19:34:38 and found out some problematic behaviour I didn't notice before.
1. When conflict occured, Resolve conflict dialog was shown with button Resolved disabled. All other buttons on dialog was enabled. When I clicked Edit, editor was shown(in my case kdiff3) and button Resolved was enabled.
2. Target file - one to be resolved - was located in Temp directory of currently logged user(win 10).
I needed to resolve some problems manually. And found it very confusing:
a) I need to click on Edit conflict button even when I want to solve conflict manually.
b) I solved it manually in working copy(there is target file with conflict markers <<<<<<<,>>>>>>> and other left, right, working counterpart files) but when I finally clicked on Resolved button, file was resolved by the copy from Temp directory.
Can anyone shed some light on it please - is it bug, standard behaviour or is there any settings related to my problem?
with regards
tomas