[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:43:26 -0500

On Fri, Aug 7, 2009 at 10:58 AM, Robert Dailey <rcdailey_at_gmail.com> wrote:

> On Fri, Aug 7, 2009 at 10:47 AM, Stefan Küng <tortoisesvn_at_gmail.com>wrote:
>
>> On 06.08.2009 17:49, Robert Dailey wrote:
>> > On Thu, Aug 6, 2009 at 12:40 AM, Stefan Küng <tortoisesvn_at_gmail.com
>> > <mailto:tortoisesvn_at_gmail.com>> wrote:
>> >
>> > On 05.08.2009 22:04, Robert Dailey wrote:
>> > > I tested this issue again on TortoiseSVN nightly and the problem
>> > still
>> > > exists. Below is my version information. According to the
>> changelog
>> > > <http://nightlybuilds.tortoisesvn.net/latest/changelog.html>,
>> this
>> > > revision should include the fix Stefan made.
>> >
>> > * how many files to you mark as resolved?
>> >
>> >
>> > Typically around 50 or more binary files.
>> >
>> > * how many of those are binary?
>> >
>> >
>> > All of them. They compose of PDB, DLL, LIB, and other binary types. Some
>> > are in the 10MB+ size range.
>> >
>> > * what happens if you use the CL client and run
>> > $ svn resolved file1 file2 file3 ...
>> > instead of
>> > $ svn resolved . -R
>> >
>> >
>> > I tried with only 3 files, since they are tough to type (Didn't type all
>> > 50 or so files). It was instantaneous to resolve those 3 files using the
>> > command you requested. I'm using the SVN 1.6.2 CL client.
>>
>> I can't reproduce this. I've tested with 20 binary files. The 'mark as
>> resolved' command was actually faster than I expected: it was finished
>> in less than a second.
>>
>> could it be that some security app is interfering on your machine,
>> preventing the 'resolve' command from actually overwriting those binary
>> files with the original version?
>
>
> I can't say if there is. If there was, why would the SVN command line work
> but not TSVN? I may try a full reinstall of TSVN and delete registry
> settings. I'll also try a new nightly build just to be safe. Sorry I can't
> give you more information, this is a tough one.
>

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

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

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

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