Glen Dayton <gdayton_at_pgpeng.com> writes:
> Some of our files have the svn:mime-type set to 'application/x-javascript'.
>
> Even though we know the file is really text, svn merge treats the file
> as a binary.
>
> I think application/x-javascript is obviously text. There doesn't
> seem to be a way to inform subversion what mime-types are actually
> text versus binary.
>
> Some our developers know better than to set svn:mime-type, but we're a
> large project so not everybody has received the word. This problem
> messes up our merge strategy.
>
> I really think this is really a subversion bug.
>
> Anybody concur?
Yes, I think we all agree. Have you seen:
http://subversion.tigris.org/issues/show_bug.cgi?id=1002
http://subversion.tigris.org/issues/show_bug.cgi?id=1233
http://subversion.tigris.org/issues/show_bug.cgi?id=2447
(especially the first)?
I think r23306 (see issue #1233) may have added something close to what
you need. We might have to extend it to more operations than just 'add'
and 'import', though. Can you take a look? (I'm busy with another
issue right now.)
For some reason, your mail does not appear to have made it into the
tigris.org archive...
http://subversion.tigris.org/servlets/SummarizeList?listName=dev
...which is worrisome. Fortunately, I can find it in the svn.haxx.se
archives here:
http://svn.haxx.se/dev/archive-2008-09/0457.shtml
I've added it to issue #1002.
I'll now send a mail to the tigris.org admins, CC'ing you, about the
fact that your post doesn't seem to be in the archives there.
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-13 20:01:57 CEST