I am able to revert the file as normal. So my current solution is to
copy the resolved file to my desktop. Revert the file in the source
tree. Then copy the modified file back into the source tree.
It is very ugly, but it works for the time being.
On Mar 19, 2:36 pm, Brian Marshall <mimar..._at_gmail.com> wrote:
> 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&dsMess...
>
> To unsubscribe from this discussion, e-mail: [users-unsubscr..._at_tortoisesvn.tigris.org].
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1364389
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-03-20 14:15:06 CET