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

RE: Re: "Resolved" causing problems?

From: Ulf Rößler <ujr_at_gmx.net>
Date: Fri, 21 Aug 2009 04:22:01 -0700 (PDT)

Hi,

> TSVN does some additional work: before marking a file as resolved, it
> scans the whole file for conflict markers (the ">>>>>", "====" and
> "<<<<<" lines) and issues a warning if it finds one.
> But of course, that's intended for text files - I guess in your case
> since you're resolving binary files that check simply takes way too long.
>
> I guess I have to find a way to not check binary files.

I'll jump in at this stage. Since I have installed the latest version 1.6.4 I'm experiencing hanging for every resolve conflict even on single (definitely text) files.
I have not changed anything else (e.g. on server) - only installed new client.
Each program (explorer or other file manager) that "resolves" a conflict via TSVN context menu hangs :-(
It worked with 1.6.3, though.
What can I do to help find the problem?

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

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-08-21 13:23:22 CEST

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