[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: Robert Dailey <rcdailey_at_gmail.com>
Date: Fri, 21 Aug 2009 08:50:08 -0500

The fix that Stefan applied is on the nightly build. You will not see this
fix until a future release. If you want to see the fix now, download a
nightly build:http://nightlybuilds.tortoisesvn.net/latest/

---------
Robert Dailey

On Fri, Aug 21, 2009 at 6:22 AM, Ulf RöŸler <ujr_at_gmx.net> wrote:

> 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].
>

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

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

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