On 27.07.2009 18:15, Robert Dailey 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.
The "Resolved" command marks conflicted files as resolved. But since you
don't have the conflict resolved yet, I guess that's why it's hanging.
The conflict can't be marked as resolved since it isn't resolved yet.
Do you have the command line client installed? Try a
$ svn resolved -R .
and see if it hangs too.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2377023
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-07-30 17:39:50 CEST