[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: Mon, 3 Aug 2009 13:20:42 -0500

On Mon, Aug 3, 2009 at 1:04 PM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:

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

I have some ideas for that, if you'll hear me out.

There's some obvious 'defaults' that you might use:

EXE, PDB, LIB, DLL, etc....

You can add a new option in the TSVN settings dialog that serves as an
inclusive list of files to scan for conflict resolution during a resolve
operation. By inclusive list I mean that by default, most items are included
in the scan except for those specified explicitly in the filter. In the
example above, those extensions would NOT be scanned. The user can also add
more, or remove the defaults.

Does Subversion add the markers to binary files as well? Or does it somehow
determine what is text and only insert them into those kinds of files?

Anyway, the option I'm suggesting is relatively easy to add. Just add an
edit control and determine a delimiter, like semi-colon, to separate


This will give you all the information you need to skip scanning those types
of files during the progress dialog of a "Resolved.." operation.


To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-08-03 20:20:51 CEST

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