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

Re: Mark resolved does not work with LVMerge

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sun, 10 Aug 2008 19:34:40 +0200

AK wrote:
> I am using TortoiseSVN with LavVIEW. I use LVMerge to edit conflicts
> through Tortoise and that works fine. But when I go to mark the
> conflict as resolved, Tortoise gives me the following message: "Error
> connecting to file...<my file>". I have to then manually delete the
> merge files.
> This does not happen with other merge tools. Any ideas?

Is LVMerge closed when you try to mark the conflict as resolved? If
LVMerge has the file(s) still open, Subversion can't mark the file as
resolved.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

Received on 2008-08-10 19:35:10 CEST

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