[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: Fri, 7 Aug 2009 12:48:44 -0500

On Fri, Aug 7, 2009 at 12:43 PM, Robert Dailey <rcdailey_at_gmail.com> wrote:

> Wow, more interesting news for you Stefan:
>
> First, what I've tried:
>
> 1. Uninstall TortoiseSVN
> 2. Reboot
> 3. Delete registry settings related to TSVN (Overlays, and user
> settings)
> 4. Install latest nightly build
> 5. Reboot
>
> Problem still exists on the binary files, same as before. However, now I'm
> trying to click "OK" in the "Resolved" dialog for an SLN file and an XML
> file (Two text files) and it hangs! It's doing the same thing! What the
> heck?!
>
> I also noticed that these 2 files were marked as conflicted (Not a tree
> conflict) during an update, but when I view the conflict in tortoise merge,
> it shows no red lines (i.e. no conflicted areas) in either file. What's
> going on?! I don't get it...
>

Also, I am able to CTRL+A all items in the resolved dialog and Right Click
>> Resolved. This takes about 20-30 seconds to complete with the binary
files, but it does achieve the goal. How are the two methods different
(context menu vs OK button)?

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

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-08-07 19:48:53 CEST

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