It seems to be because if you do merges too fast you hit locked state files (and not limited to command line), which seems to take longer for TortoiseSVN to process on large repositories. You can see this when opening the Merge dialogue window, TortoiseSVN client shows processing in Task Manager and only once it's finished I can continue with the merging and not have it error.
This results in me waiting 10-20 seconds or so before continuing merges each time. Hopefully this helps narrow it down, the best solution's might making it so when it gets to doing the actual Merging it can check if it's still processing and wait before continuing? Cheers, Kieren On Friday, May 9, 2025 at 11:19:45 AM UTC+12 Kieren wrote: > Bumping this as it's still a problem for large checkouts and we're > regularly having to retry several times, or sometimes have to sit on the > merge window for a minute before trying to merge for it to go through > > Cheers. > > On Thursday, July 4, 2024 at 10:52:58 AM UTC+12 Kieren wrote: > >> I think I've figured out what might be doing it and how to get around it: >> >> If I open the Merge window and then click Merge too quickly it gives the >> repo is locked and require cleanup error, but if you open the Merge window >> then wait a little it goes through fine. Which could explain why we could >> get the error then re-trying again without a cleanup would work fine. >> >> I assume it's locking the repo for a moment while loading something, and >> not sure if how we pre-populate the commit list with TortoiseProc adds to >> that time or not. It's particularly worse on large repositories (talking >> like 1TB) , but waiting ~5s before clicking Merge seems to stop it from >> happening there too. Hopefully that info helps. >> >> Cheers. >> >> On Tuesday, June 4, 2024 at 9:22:18 AM UTC+12 Kieren wrote: >> >>> >>> All on local drives. Same problem happening for others using the same >>> checkouts. Some have found setting Status cache to None helps, or sometimes >>> killing the TSVNCache.exe and re-trying. >>> On Saturday, May 25, 2024 at 2:08:43 AM UTC+12 Stefan wrote: >>> >>>> one sure way to get errors that require a cleanup is to have the >>>> working copies stored on a network share instead of a local drive. >>> >>> -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion visit https://groups.google.com/d/msgid/tortoisesvn/2cea884a-7e49-4b32-91ed-b370b4710be9n%40googlegroups.com.
