[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 07 Aug 2009 21:48:31 +0200

On 07.08.2009 19:48, Robert Dailey wrote:
> On Fri, Aug 7, 2009 at 12:43 PM, Robert Dailey <rcdailey_at_gmail.com
> <mailto: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)?

The only difference I can see is that with the right-click->resolved,
the svn_client_resolved() API is called with --recurse set to false,
while it's set to true if you click on the OK button and have the
progress dialog do the resolving.

Try an
$ svn resolved conflictedfile1 conflictedfile2 -R

maybe svn has problems detecting that the recurse flag should ignore files?

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=2381440
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-08-07 21:48:56 CEST

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