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

Re: TortoiseSVN Cannot Merge

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 20 Oct 2014 21:56:07 +0200

On 20.10.2014 16:27, smahabir_at_goodlifefitness.com wrote:
> Error Message: 'Folder' is already locked via

via what?

> Tried:
>
> Running 'Clean up' on root folder
> Running 'Update' on root folder
> Checked for 'Lock' files
> Opened wc.db and checked lock tables
> disabled anti-virus
> disabled IIS
> Removed entire branch and checked out a fresh copy
> Updated TortoiseSVN, Downgraded Tortoise SVN (15 different versions tried)
> Completed uninstalled and re-installed (multiple times).
> Disabled Icon Overlays
> Ran 'Show Lock' / 'Release Lock' does not show any locks
> Have nothing opened during merge (even killed explorer.exe)
> Restarting PC...
>
> Was able to merge fine until I updated to the latest version, since then I have not been able to merge consistently for the past 3 weeks: odds are every 100 attempts, 1 is successful.
>
> Requesting any assistance possible in this issue.

Try updating the target working copy first. This usually helps.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3090204
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-10-20 21:55:59 CEST

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.