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

RE: Re: TSVN locking Bug

From: Lewis Stalbird <lstalbir_at_epic.com>
Date: Sat, 19 Aug 2017 05:05:15 -0700 (PDT)

This has been an issue for us for a long time. We launch TortoiseSVN with specific revisions we want to merge with the revrange option, so the end-user does not need to enter them.

An user can hit this by:
- Clicking next on the Merge revision range form immediately.
- Clicking merge on the next form.
- The merge fails to get the lock on the wc.db file.

I dug into the source code a little bit to see what was going on and here is what I found:
- When we launch any merge form, we start a thread to check if the destination working copy has any local modifications.
- When the end-user clicks next, we stop the thread and leaves an orphaned lock on wc.db.
- The end-user kicks of the merge, which ends up on a new thread.
- The new merge thread fails to get the lock on wc.db and freaks out.

Our repositories are up there in size, so the check can take around 15 seconds or on really slow machines, a few minutes. The ideal fix I would imagine would be to have an option in the Advanced settings to skip the working copy status check for the merges.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2017-08-19 14:07:00 CEST

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