[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 15:26:01 +0200

>> 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.
> 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?
Check out the File Content Type section in the SVN Book:


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

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