[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: Andy Levy <andy.levy_at_gmail.com>
Date: 2006-05-10 17:17:33 CEST

On 5/10/06, Edward Harvey <eharvey@chilsemi.com> wrote:
> I know .txt files can.
> I know .doc files can't.
> Is there a list someplace? Or a characteristic I can look for?
> Is automatic merging part of TortoiseMerge, or TortoiseSVN, or part of
> subversion itself?

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.

To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed May 10 17:19:11 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.