[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: Mon, 03 Aug 2009 20:04:10 +0200

On 03.08.2009 16:57, Robert Dailey wrote:
> On Thu, Jul 30, 2009 at 10:39 AM, Stefan Küng <tortoisesvn_at_gmail.com
> <mailto:tortoisesvn_at_gmail.com>> wrote:
>
> 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.
>
>
> I tried the command you requested using SVN 1.6.2 command-line and it
> worked perfectly. Below is a sample of the output (Note that there are
> about 100 more files that it is resolving that I did not show to keep
> the list short):
>
> C:\IT\work\Mico\RadixSDK>svn resolved -R .
> Resolved conflicted state of 'lib\RadixAudit-Debug.pdb'
> Resolved conflicted state of 'lib\RadixEngine-Debug.lib'
> Resolved conflicted state of 'lib\MEICashflowSC-Debug.map'
> Resolved conflicted state of 'lib\CardAccess-Debug.map'
> Resolved conflicted state of 'lib\RocketAccountingAdapter-Debug.lib'
>
> So it seems that this is a TSVN issue. It worked on the command line,
> but does not work via TortoiseSVN.

TSVN does some additional work: before marking a file as resolved, it
scans the whole file for conflict markers (the ">>>>>", "====" and
"<<<<<" lines) and issues a warning if it finds one.
But of course, that's intended for text files - I guess in your case
since you're resolving binary files that check simply takes way too long.

I guess I have to find a way to not check binary 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=2379667
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-08-03 20:04:33 CEST

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