Hi Brian! VisualSVN doesn't add any default properties to files by itself. Theoretically you could have problem with incorrect Subversion settings.
>Is there some way to change (or eliminate) the default mime-type for .cs files? Please try the following: * Select Tools-> Options in Visual Studio main menu and open VisualSVN section, * Click there "TortoiseSVN Settings" link * Press "Edit" for "Subversion Configuration File" on the General Tab * Find the MIME settings in the opened window E.g. the following section [[ [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. # *.c = svn:eol-style=native # *.cpp = svn:eol-style=native # *.h = svn:eol-style=native # *.dsp = svn:eol-style=CRLF # *.dsw = svn:eol-style=CRLF # *.sh = svn:eol-style=native;svn:executable # *.txt = svn:eol-style=native # *.png = svn:mime-type=image/png # *.jpg = svn:mime-type=image/jpeg # Makefile = svn:eol-style=native ]] On Fri, Jan 30, 2009 at 5:39 PM, Brian Victor <homeusen...@brianhv.org> wrote: > > Windows XP SP3 > Visual Studio 9.0.30729.1 SP > VisualSVN 1.6 > TortoiseSVN 1.5.6, Build 14908. > > Thanks, and sorry for neglecting to include that in the first place! > > On Jan 30, 8:15 am, VisualSVN Support <supp...@visualsvn.com> wrote: >> Hi Brian! >> >> Could you please provide details about your configuration: >> >> *what version of Windows do you have? >> *what version of VS do you have? >> *what version of VisualSVN do you have? >> *what version of TortoiseSVN do you have? >> >> Thank you! >> >> On Thu, Jan 29, 2009 at 10:22 PM, Brian Victor <homeusen...@brianhv.org> >> wrote: >> >> > I'm using VisualSVN on a C# project. I'm finding that when new .cs >> > files are created, VisualSVN is adding them to the repository with an >> > svn:mime-type property of application/octet-stream. This is causing >> > merges to behave incorrectly for those files. >> >> > Is there some way to change (or eliminate) the default mime-type >> > for .cs files? >> >> > Thanks! >> >> > -- >> > Brian >> >> -- >> Olga Dolidze >> VisualSVN Support > -- Olga Dolidze VisualSVN Support