<?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>13007</bug_id>
          
          <creation_ts>2007-03-07 15:05:43 -0800</creation_ts>
          <short_desc>svn-create-patch doesn&apos;t handle UTF files with BOMs as text</short_desc>
          <delta_ts>2007-03-09 16:55:30 -0800</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>523.x (Safari 3)</version>
          <rep_platform>Mac</rep_platform>
          <op_sys>OS X 10.4</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <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>1</everconfirmed>
          <reporter name="Andrew Wellington">andrew</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>ap</cc>
    
    <cc>ddkilzer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>19978</commentid>
    <comment_count>0</comment_count>
    <who name="Andrew Wellington">andrew</who>
    <bug_when>2007-03-07 15:05:43 -0800</bug_when>
    <thetext>svn-create-patch gets confused at strings files because diff isn&apos;t treating the files as text (it sees the BOM in the UTF-16 file)

Patch to be attached forces all files that svn-create-patch thinks are text to be treated as text.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>19954</commentid>
    <comment_count>1</comment_count>
      <attachid>13534</attachid>
    <who name="Andrew Wellington">andrew</who>
    <bug_when>2007-03-07 15:10:39 -0800</bug_when>
    <thetext>Created attachment 13534
Patch

Trivial patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>19863</commentid>
    <comment_count>2</comment_count>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2007-03-07 16:40:11 -0800</bug_when>
    <thetext>If you create the patch with this change to svn-create-patch, run svn-unapply, then svn-apply, do you end up with the same changes once you&apos;re done?  I&apos;m wondering if there would be any text conversion funny-business where one two-byte UTF-16 character would get split into two one-byte UTF-8 characters in the process.

</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>19865</commentid>
    <comment_count>3</comment_count>
    <who name="Andrew Wellington">andrew</who>
    <bug_when>2007-03-07 17:08:23 -0800</bug_when>
    <thetext>In my testing it appears to work correctly in the situation David described.

I just tried adding a line of Japanese text to a file, checking md5 of the file, creating a patch, svn-unapply, svn-apply, checking the md5 of the file. At both points the md5 was identical.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>19866</commentid>
    <comment_count>4</comment_count>
      <attachid>13534</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2007-03-07 17:24:22 -0800</bug_when>
    <thetext>Comment on attachment 13534
Patch

Can svn-apply and svn-unapply handle these kind of diffs?

If not, we need to fix those first.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>19915</commentid>
    <comment_count>5</comment_count>
      <attachid>13534</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2007-03-08 08:58:32 -0800</bug_when>
    <thetext>Comment on attachment 13534
Patch

r=me</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>19731</commentid>
    <comment_count>6</comment_count>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2007-03-09 16:55:30 -0800</bug_when>
    <thetext>Committed revision 20095.

</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>13534</attachid>
            <date>2007-03-07 15:10:39 -0800</date>
            <delta_ts>2007-03-08 08:58:32 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>svn-patch-text-patch.txt</filename>
            <type>text/plain</type>
            <size>1094</size>
            <attacher name="Andrew Wellington">andrew</attacher>
            
              <data encoding="base64">SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D
aGFuZ2VMb2cJKHJldmlzaW9uIDIwMDI5KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr
aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTEgQEAKKzIwMDctMDMtMDggIEFuZHJldyBXZWxsaW5ndG9u
ICA8cHJvdG9uQHdpcmV0YXBwZWQubmV0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo
T09QUyEpLgorICAgICAgICAKKyAgICAgICAgRm9yY2UgZGlmZiB0byB0cmVhdCBmaWxlcyB0aGF0
IHN2bi1jcmVhdGUtcGF0Y2ggdGhpbmtzIGFyZSB0ZXh0IGFzIHRleHQKKworICAgICAgICAqIFNj
cmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaDoKKwogMjAwNy0wMy0wNyAgQW5kZXJzIENhcmxzc29uICA8
YWNhcmxzc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtLgpJbmRleDog
V2ViS2l0VG9vbHMvU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNoCj09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp
dFRvb2xzL1NjcmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaAkocmV2aXNpb24gMjAwMjkpCisrKyBXZWJL
aXRUb29scy9TY3JpcHRzL3N2bi1jcmVhdGUtcGF0Y2gJKHdvcmtpbmcgY29weSkKQEAgLTIyMSw3
ICsyMjEsNyBAQCBzdWIgZ2VuZXJhdGVEaWZmKCQkJCkKICAgICBpZiAoJG1vZGlmaWNhdGlvblR5
cGUgZXEgImFkZGl0aW9uV2l0aEhpc3RvcnkiKSB7CiAgICAgICAgIG1hbnVmYWN0dXJlUGF0Y2hG
b3JBZGRpdGlvbldpdGhIaXN0b3J5KCRmaWxlLCAkaXNCaW5hcnkpOwogICAgIH0KLSAgICBvcGVu
IERJRkYsICJzdm4gZGlmZiAtLWRpZmYtY21kIGRpZmYgLXggLXVOcCAnJGZpbGUnIHwiIG9yIGRp
ZTsKKyAgICBvcGVuIERJRkYsICJzdm4gZGlmZiAtLWRpZmYtY21kIGRpZmYgLXggLXVhTnAgJyRm
aWxlJyB8IiBvciBkaWU7CiAgICAgd2hpbGUgKDxESUZGPikgewogICAgICAgICAkcGF0Y2ggLj0g
JF87CiAgICAgfQo=
</data>
<flag name="review"
          id="5359"
          type_id="1"
          status="+"
          setter="darin"
    />
          </attachment>
      

    </bug>

</bugzilla>