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

Re: "Resolved" causing problems?

From: Robert Dailey <rcdailey_at_gmail.com>
Date: Wed, 29 Jul 2009 12:17:58 -0500

I'd appreciate some input on this.

---------
Robert Dailey

On Mon, Jul 27, 2009 at 11:15 AM, Robert Dailey <rcdailey_at_gmail.com> wrote:

> Hello,
> Unfortunately I am unable to provide much insight into this problem since I
> am not sure exactly what information is relevant, but do feel free to follow
> up with more questions.
>
> Sometimes I do an update of a working copy of mine and I receive updates to
> LIB, DLL, and PDB files (All binary). However, on my working copy I have
> modifications of all of these already. So as a result, I get about 100-200
> conflicted binary files during an update. I dismiss the update dialog when
> it completes, then I right click on my root WC directory and select
> 'Resolved'. A list of all of the DLL, PDB, and LIB files that are conflicted
> is presented and I make sure all of them are checked. I then proceed to
> click 'OK' and the progress dialog appears. However, I let it sit for over
> 30 minutes and there is still no activity or progress being displayed. I
> have to click "Cancel" several times, which does nothing, and clicking the X
> at the top closes the progress dialog with no errors.
>
> I'm using the latest nightly build. Version information is as follows:
> TortoiseSVN 1.6.99, Build 16734 - 32 Bit -dev, 2009/07/24 15:56:56
> Subversion 1.6.4, -dev
> apr 1.3.5
> apr-utils 1.3.7
> neon 0.28.4
> OpenSSL 0.9.8k 25 Mar 2009
> zlib 1.2.3
>
> The server is using, I believe, Apache and SVN 1.4.x. I'm not sure if the
> server is relevant at this point, however (Resolving conflicts is a local
> operation, right?). Any idea what might be causing the "Resolve" to fail?
> Note that I can do a "Revert" to get the same affect as resolving them
> would, and it works just fine. It's just the "Resolved..." feature that is
> failing.
>
> If I can provide any other information please let me know.
>
> ---------
> Robert Dailey
>

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

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-07-29 19:18:12 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.