[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: Hans-Emil Skogh <Hans-Emil.Skogh_at_tritech.se>
Date: Tue, 4 Aug 2009 08:33:01 +0200

>> Resolved conflicted state of 'lib\RadixAudit-Debug.pdb'
>> Resolved conflicted state of 'lib\RadixEngine-Debug.lib'
>> Resolved conflicted state of 'lib\MEICashflowSC-Debug.map'
...
> 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.
...
> I guess I have to find a way to not check binary files.

Hopefully these files already have a svn:mime-type property set indicating that they are not text files. Perhaps that would be a good thing to check for?
 
Hans-Emil

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

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-08-04 08:33:35 CEST

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