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

RE: Re: Edit Conflict greyed-out

From: Bob Archer <bob.archer_at_amsi.com>
Date: Tue, 23 Mar 2010 16:49:23 -0400

> I do appreciate your input; thank you for your idea. :)
>
> But I must be missing something towards the point you are making. If the
> default is for TortoiseSVN to assign an svn:mime-type of
> application/octetstream to .sql files, then if I do nothing to change my
> configuration settings, I would have to remove that svn type going forward
> on any files for which I want to edit conflicts, no?
>
> -Lori

From the svn manual:

"To determine whether a contextual merge is possible, Subversion examines the svn:mime-type property. If the file has no svn:mime-type property, or has a MIME type that is textual (e.g., text/*), Subversion assumes it is text. Otherwise, Subversion assumes the file is binary. Subversion also helps users by running a binary-detection algorithm in the svn import and svn add commands. These commands will make a good guess and then (possibly) set a binary svn:mime-type property on the file being added. (If Subversion guesses wrong, the user can always remove or hand-edit the property.)"

> If the default is for TortoiseSVN to assign an svn:mime-type of application/octetstream to .sql files

Are you saying svn is adding the invalid mime type to your .sql files when you add them? I can't imagine why. Unless you are using some strange encoding or line ending.

Of course, if it does add the mime type on its own, you have no choice but to specify it. My assumption was that someone manually added this mime type incorrectly rather than it being set erroneously by svn.

BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-03-23 21:48:15 CET

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