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

Re: Edit Conflict greyed-out

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 23 Mar 2010 19:10:36 +0100

On 23.03.2010 18:38, Lori Howland wrote:
> Update: Trying to work this out... Now I see same svn:mime-type set
> to application/octetstream for .sql files that are updated. So some
> of my .sql files have that type and some do not.
> I have found my settings config file and added # *.sql =
> svn:mime-type=text/plain

You've still commented the setting. Remove the '#' char in front,
otherwise it won't work.

> to the section ### Section for configuring automatic properties.
> [auto-props] ### The format of the entries is: ###
> file-name-pattern = propname[=value][;propname[=value]...] ### The
> file-name-pattern can contain wildcards (such as '*' and ### '?').
> All entries which match (case-insensitively) will be ### applied to
> the file. Note that auto-props functionality ### must be enabled,
> which is typically done by setting the ### 'enable-auto-props'
> option.

and add the line above here, *after* the '[auto-props]'.

> I'm not sure what I've accomplished yet, or how this configuration
> setting will affect sql files that already have the svn:mime-type set
> to application/octetstream.

You have to manually change the svn:mime-type property on those files.
The auto-props settings only work for new files.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-03-23 19:10:40 CET

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.