[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: What files can be automatically merged?

From: Nathan Kidd <nathan-svn_at_spicycrypto.ca>
Date: 2006-05-10 18:19:47 CEST

Edward Harvey wrote:
>> Plain-text files can be auto-merged. Binary files cannot.
>> This is coded in the SVN libraries (which TSVN uses), but the
>> svn:mime-type property is a big helper here in telling the
>> libraries what files can be automatically merged.
> I see that I can change the mime-type property. But how does it
> originally get set?

Mainly svn has a routine which (IIRC) goes like this:
scan first 1024 bytes of the file, if non ASCII chars found treat file
as binary by adding svn:mime-type = binary/octet-stream
Those details might be a bit off, but thats the general idea.

Your svn config file will typically add mime-type auto-props for certain
file types, like .jpg, .png, etc.


To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed May 10 18:18:24 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.