<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>80104</bug_id>
          
          <creation_ts>2012-03-01 23:22:03 -0800</creation_ts>
          <short_desc>./Tools/Scripts/svn-apply fails while trying to process patch generated with png(binary) file.</short_desc>
          <delta_ts>2012-10-08 23:13:42 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Tools / Tests</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>DUPLICATE</resolution>
          <dup_id>80762</dup_id>
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>0</everconfirmed>
          <reporter name="SravanKumar S(:sravan)">ssandela</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>dbates</cc>
    
    <cc>kbolisetty</cc>
    
    <cc>mrahaman</cc>
    
    <cc>ssandela</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>569317</commentid>
    <comment_count>0</comment_count>
    <who name="SravanKumar S(:sravan)">ssandela</who>
    <bug_when>2012-03-01 23:22:03 -0800</bug_when>
    <thetext>It is found that when we run &apos;svn-create-patch&apos; involving a png file, the patch has following characters in it. 

Property changes on: abc.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png


which svn-apply is not able to process. The above characters are footer data when 
&quot;svn-diff --diff-cmd -diff abc.png&quot; 
is run inside svn-apply, which VCSUtils.pm is not able to process.

Because of this, patches generated on Windows(Win-7, Cygwin, svn1.7.2) and Linux terminals are failing on build bots.

When svn-create-patch is run on MAC Machine, there is no such issue and it generates following kind of footer.

Property changes on: abc.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

which is of-course being processed by svn-apply script through VCSUtils.pm file.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>569489</commentid>
    <comment_count>1</comment_count>
    <who name="SravanKumar S(:sravan)">ssandela</who>
    <bug_when>2012-03-02 03:04:45 -0800</bug_when>
    <thetext>One more observation is that, the MAC machine i used has svn version 1.6.17.
So, i think it has got some thing to do with svn1.7+ Release.

As from following link
http://subversion.apache.org/docs/release-notes/1.7.html#diff-properties

looks these characters are valid and should be handled by the script.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>570103</commentid>
    <comment_count>2</comment_count>
    <who name="SravanKumar S(:sravan)">ssandela</who>
    <bug_when>2012-03-02 19:58:38 -0800</bug_when>
    <thetext>Looks like, mime-type detection with libmagic in svn1.7+ switches the automatically configured mime-type from &apos;application/octet-stream&apos; to &apos;image/png&apos;.

http://subversion.apache.org/docs/release-notes/1.7.html#libmagic-support

so any one stuck with this problem, can for the time being compile svn with out libmagic support.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>737439</commentid>
    <comment_count>3</comment_count>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2012-10-08 23:13:42 -0700</bug_when>
    <thetext>

*** This bug has been marked as a duplicate of bug 80762 ***</thetext>
  </long_desc>
      
      

    </bug>

</bugzilla>