Resolved... not working on .vi files

I am having troubles resolving conflicts on LabView .vi files. I am
using lvmerge to resolve the conflicts. Once the conflicts are
resolved I click TortoiseSVN-> resolved… This brings up the following
error:

Error: An unknown error occurred while accessing <filepath>.vi.

Resolving conflicts in any other fileformat works fine.

Does tortoiseSVN have a setting somewhere to try and use its diff or
merge program when resolving a conflict? I don’t think any other
program has the file locked, but I am looking into that as well.

Thanks,
Brian Marshall

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-03-19 19:36:56 CET