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

Re: MIME types

From: Greg Thomas <thomasgd_at_omc.bt.co.uk>
Date: Thu, 18 Sep 2008 11:01:26 +0100

On Thu, 18 Sep 2008 11:53:47 +0200, "Jan Hendrik"
<list.jan.hendrik_at_gmail.com> wrote:

>But then how about those application/javascript or image/svg+xml
>down to application/xhtml+xml types which (almost always?) are
>plain text files SVN could but would not merge?

That's the second question;

Either
(a) ISTR you can use the --force parameter, which forces merging of
files svn believes to be binary, or
(b) Wait until
http://subversion.tigris.org/issues/show_bug.cgi?id=1002 is fixed.

Greg

-- 
This post represents the views of the author and does
not necessarily accurately represent the views of BT.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-09-18 12:01:52 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.