Discussion:
TortoiseSVN Cannot Merge
s***@public.gmane.org
2014-10-20 14:27:25 UTC
Permalink
Error Message: 'Folder' is already locked via

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.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe-6zjzXkf2FExf8fUKLXF2/HdfcadvtA/***@public.gmane.org].
Stefan Küng
2014-10-20 19:56:07 UTC
Permalink
Post by s***@public.gmane.org
Error Message: 'Folder' is already locked via
via what?
Post by s***@public.gmane.org
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-6zjzXkf2FExf8fUKLXF2/HdfcadvtA/***@public.gmane.org].
Steve
2014-10-21 17:02:59 UTC
Permalink
That's the exact error message.

Merging Revision xxxxx
Error: 'Folder' is already locked via
Success!


Thats that the output looks like in SVN.

Side Note: reports success also upon failure.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe-6zjzXkf2FExf8fUKLXF2/HdfcadvtA/***@public.gmane.org].
Loading...