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

Re: Re: What files can be automatically merged?

From: Andy Levy <andy.levy_at_gmail.com>
Date: 2006-05-10 18:18:41 CEST

On 5/10/06, Edward Harvey <eharvey@chilsemi.com> 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?

If it's been set, then it was either done by someone else, or by auto-props.

SVN may look at the file itself if the property isn't set, and try to
guess as to wether it's auto-merge-able or not.

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