<?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>235268</bug_id>
          
          <creation_ts>2022-01-15 11:38:02 -0800</creation_ts>
          <short_desc>Only use `diff --binary` switch on Windows</short_desc>
          <delta_ts>2022-01-15 15:11:35 -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>Other</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          <dependson>27323</dependson>
          
          <everconfirmed>1</everconfirmed>
          <reporter name="David Kilzer (:ddkilzer)">ddkilzer</reporter>
          <assigned_to name="David Kilzer (:ddkilzer)">ddkilzer</assigned_to>
          <cc>ap</cc>
    
    <cc>bburg</cc>
    
    <cc>jbedard</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1831218</commentid>
    <comment_count>0</comment_count>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2022-01-15 11:38:02 -0800</bug_when>
    <thetext>Only use `diff --binary` switch on Windows.

It was originally added for Windows ports that were not using Cygwin:

Bug 27323: Further improve non-Cygwin SVN support.
&lt;https://bugs.webkit.org/show_bug.cgi?id=27323&gt;
&lt;https://commits.webkit.org/r46095&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1831219</commentid>
    <comment_count>1</comment_count>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2022-01-15 11:38:15 -0800</bug_when>
    <thetext>&lt;rdar://problem/87490487&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1831220</commentid>
    <comment_count>2</comment_count>
      <attachid>449260</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2022-01-15 11:40:15 -0800</bug_when>
    <thetext>Created attachment 449260
Patch v1</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1831221</commentid>
    <comment_count>3</comment_count>
      <attachid>449260</attachid>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2022-01-15 11:46:16 -0800</bug_when>
    <thetext>Comment on attachment 449260
Patch v1

Do &quot;-u -a&quot; mean the same thing as expected in the scenario that you are addressing?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1831266</commentid>
    <comment_count>4</comment_count>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2022-01-15 14:46:21 -0800</bug_when>
    <thetext>(In reply to Alexey Proskuryakov from comment #3)
&gt; Comment on attachment 449260 [details]
&gt; Patch v1
&gt; 
&gt; Do &quot;-u -a&quot; mean the same thing as expected in the scenario that you are
&gt; addressing?

Yes.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1831273</commentid>
    <comment_count>5</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-01-15 15:11:31 -0800</bug_when>
    <thetext>Committed r288068 (246088@main): &lt;https://commits.webkit.org/246088@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 449260.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449260</attachid>
            <date>2022-01-15 11:40:15 -0800</date>
            <delta_ts>2022-01-15 15:11:33 -0800</delta_ts>
            <desc>Patch v1</desc>
            <filename>bug-235268-20220115114014.patch</filename>
            <type>text/plain</type>
            <size>1389</size>
            <attacher name="David Kilzer (:ddkilzer)">ddkilzer</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3ODI4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGIyZTBkYWMxZjdiYWY2MGYwYzJjOTkxNjhjMzRiNGU2
MDQwZWRhMC4uZjhkZWQyNjhmZTY3NzZjYzkzODc3YzExZjkzMjE3NDljZDgyMjU4MCAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1
IEBACisyMDIyLTAxLTE1ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAg
ICAgICAgT25seSB1c2UgYGRpZmYgLS1iaW5hcnlgIHN3aXRjaCBvbiBXaW5kb3dzCisgICAgICAg
IDxodHRwczovL3dlYmtpdC5vcmcvYi8yMzUyNjg+CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84
NzQ5MDQ4Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg
ICAqIFNjcmlwdHMvVkNTVXRpbHMucG06CisgICAgICAgIChtZXJnZUNoYW5nZUxvZ3MpOgorICAg
ICAgICAtIE9ubHkgcGFzcyBgLS1iaW5hcnlgIHN3aXRjaCBvbiBXaW5kb3dzLgorCiAyMDIyLTAx
LTA4ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIE51
bGwgcG9pbnRlciBjcmFzaCB3aGVuIGNhbGxpbmcgaW50byBgLVtXZWJWaWV3IGNsb3NlXWAgaW4g
YC13ZWJWaWV3OmRpZENvbW1pdExvYWRGb3JGcmFtZTpgCmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp
cHRzL1ZDU1V0aWxzLnBtIGIvVG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQppbmRleCA0ODZkMDFm
NTNjODkyYzFhZjk1ZjdkNThiZTZhOTcxOTY0MTlkYTcxLi5kZjhiNTVmZTI0OWE5MGYxNmM4ZTQ1
MWMzZDAyODc2N2UwMTUzNzcxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL1ZDU1V0aWxzLnBt
CisrKyBiL1Rvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0KQEAgLTIxNDgsNyArMjE0OCw4IEBAIHN1
YiBtZXJnZUNoYW5nZUxvZ3MoJCQkKQogICAgICAgICByZW5hbWUoJGZpbGVNaW5lLCAiJGZpbGVN
aW5lLnNhdmUiKTsKICAgICAgICAgcmVuYW1lKCRmaWxlT2xkZXIsICIkZmlsZU9sZGVyLnNhdmUi
KTsKICAgICB9IGVsc2UgewotICAgICAgICBvcGVuKERJRkYsICJkaWZmIC11IC1hIC0tYmluYXJ5
IFwiJGZpbGVPbGRlclwiIFwiJGZpbGVNaW5lXCIgfCIpIG9yIGRpZSAkITsKKyAgICAgICAgbXkg
JGJpbmFyeVN3aXRjaCA9IGlzV2luZG93cygpID8gIi0tYmluYXJ5IiA6ICIiOworICAgICAgICBv
cGVuKERJRkYsICJkaWZmIC11IC1hICRiaW5hcnlTd2l0Y2ggXCIkZmlsZU9sZGVyXCIgXCIkZmls
ZU1pbmVcIiB8Iikgb3IgZGllICQhOwogICAgICAgICAkcGF0Y2ggPSA8RElGRj47CiAgICAgICAg
IGNsb3NlKERJRkYpOwogICAgIH0K
</data>

          </attachment>
      

    </bug>

</bugzilla>