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

Re: TortoiseSVN hangs on commit when there is a conflict with the repo

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 26 Aug 2008 18:07:20 +0200

Garratt wrote:
> Hello all
>
> We have a strange problem.
> If my collegue checks in a file, Myfile.c, and I, without updating
> first make a change in the same file which conflicts his change and
> then commit. Then Tortoise commit window only writes "Modified SVN
> \Project\Trunk\MyFile.c" and never completes.
> We can reproduce this without any problems. Every time we commit to
> the repo and the repo has a file that will conflict our change,
> Tortoise just never completes the commit. You can still move the
> commit window around so it's still alive and if we try to shutdown the
> window on the x in the corner it closes after a while.
>
> To solve the problem we currently close the hanging commit window, do
> an svn update, resolves the conflict and then commit. This takes care
> of the problem, until next time we have a conflict.
>
> Yesterday we upgraded from 1.5.0 to 1.5.2 without restarting the pc's
> and we could not reproduce the error. Of course we thought the problem
> had been solved :). This morning after restarting our machines we can
> again reproduce the hang every time.
>
> Our setup:
> WinXP SP3 on Intel Xeon 2.33 Ghz, 3 gb ram.
> TortoiseSVN version 1.5.2
>
> Server:
> VisualSVN Server 1.5.1
>
>
> We have tried just about everything we can think off. Anyone got any
> pointers as to what the problem is?

In case of a conflict, the server/repository sends an out-of-date error
back to the client. Seems somehow that error doesn't get through to the
client here. I have no idea why that is though. Do you have some
firewall active?

Stefan

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

Received on 2008-08-26 18:07:39 CEST

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