[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: Garratt <Christian.H.Mikkelsen_at_gmail.com>
Date: Wed, 27 Aug 2008 03:37:52 -0700 (PDT)

Checked today if we have a firwall which could be interfering but
couldnt see any blocks in the Windows firewall and just to be sure I
added the TortoiseProc, Tortoiseplink and the TSVNCache as exceptions
but without any results.
Did however do a wireshark test and got this:

    700 7.565277000 10.0.2.93 10.0.2.201 TCP
4992 > http [ACK] Seq=83 Ack=5539 Win=65530 [TCP CHECKSUM INCORRECT]
Len=0
    730 9.208239000 10.0.2.93 10.0.2.201 TCP
4995 > pcsync-https [SYN] Seq=0 Win=65535 Len=0 MSS=1460
    731 9.208450000 10.0.2.201 10.0.2.93 TCP
pcsync-https > 4995 [SYN, ACK] Seq=0 Ack=1 Win=65535 Len=0 MSS=1460
    732 9.208472000 10.0.2.93 10.0.2.201 TCP
4995 > pcsync-https [ACK] Seq=1 Ack=1 Win=65535 [TCP CHECKSUM
INCORRECT] Len=0
    750 10.539282000 10.0.2.93 10.0.2.201 TCP 4995
> pcsync-https [PSH, ACK] Seq=1 Ack=1 Win=65535 [TCP CHECKSUM
INCORRECT] Len=108
    751 10.548191000 10.0.2.201 10.0.2.93 TCP
pcsync-https > 4995 [PSH, ACK] Seq=1 Ack=109 Win=65427 Len=1089
    752 10.560364000 10.0.2.93 10.0.2.201 TCP 4995 >
pcsync-https [PSH, ACK] Seq=109 Ack=1090 Win=64446 [TCP CHECKSUM
INCORRECT] Len=198
    753 10.566565000 10.0.2.201 10.0.2.93 TCP
pcsync-https > 4995 [PSH, ACK] Seq=1090 Ack=307 Win=65229 Len=59
    756 10.636184000 10.0.2.93 10.0.2.201 TCP 4995 >
pcsync-https [PSH, ACK] Seq=307 Ack=1149 Win=64387 [TCP CHECKSUM
INCORRECT] Len=453

10.0.2.93 is me, the other one is the server on https.

It appears that for some reason the packages has an incorrect
checksum. Does this mean anything to you?

Regards
Garratt

On Aug 26, 6:07 pm, Stefan Küng <tortoise..._at_gmail.com> wrote:
> 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
>
>  signature.asc
> < 1KViewDownload

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-08-27 12:38:34 CEST

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