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

Resolved... not working on .vi files

From: Brian Marshall <mimarsh2_at_gmail.com>
Date: Thu, 19 Mar 2009 11:36:14 -0700 (PDT)

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: 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.

Brian Marshall


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

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.