Nicholas Clark wrote:
> On Mon, Apr 11, 2005 at 01:43:39AM -0000, [EMAIL PROTECTED] wrote:
[snip]
>> Modified: trunk/t/perl/Parrot_IO.t
>> ==============================================================================
>> Binary files. No diff available.

> Oops. Is this a property thing on all the files that any committer can fix
> (once they know the magic)?

I think this is just a mime-type issue.

    $svn proplist Parrot_IO.t
    Properties on 'Parrot_IO.t':
      cvs2svn:cvs-rev
      svn:mime-type
      svn:keywords
      svn:eol-style

    $svn propget svn:mime-type Parrot_IO.t
    application/x-troff

Cf http://svnbook.red-bean.com/en/1.1/svn-book.html#svn-ap-a-sect-8
"
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.)
"







Reply via email to