<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[173438] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/173438">173438</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-09 13:12:56 -0700 (Tue, 09 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>svn-{apply, unapply} fails to apply/unapply SVN 1.7 patch that adds new file with property change
https://bugs.webkit.org/show_bug.cgi?id=136379
Patch by Daniel Bates <dbates@webkit.org> on 2014-09-09
Reviewed by David Kilzer.
Fixes an issue where svn-{apply, unapply} fail to apply or unapply, respectively,
a patch generated using Subversion 1.7.4 (<a href="http://trac.webkit.org/projects/webkit/changeset/1295709">r1295709</a>) that both adds a new file F
and sets a property on F (say, the executable bit).
* Scripts/svn-apply:
(patch): Only add file if the diff has text chunks.
* Scripts/svn-unapply:
(patch): Only delete added file if the diff has text chunks.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptssvnapply">trunk/Tools/Scripts/svn-apply</a></li>
<li><a href="#trunkToolsScriptssvnunapply">trunk/Tools/Scripts/svn-unapply</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (173437 => 173438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-09-09 19:51:15 UTC (rev 173437)
+++ trunk/Tools/ChangeLog 2014-09-09 20:12:56 UTC (rev 173438)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-09-09 Daniel Bates <dbates@webkit.org>
+
+ svn-{apply, unapply} fails to apply/unapply SVN 1.7 patch that adds new file with property change
+ https://bugs.webkit.org/show_bug.cgi?id=136379
+
+ Reviewed by David Kilzer.
+
+ Fixes an issue where svn-{apply, unapply} fail to apply or unapply, respectively,
+ a patch generated using Subversion 1.7.4 (r1295709) that both adds a new file F
+ and sets a property on F (say, the executable bit).
+
+ * Scripts/svn-apply:
+ (patch): Only add file if the diff has text chunks.
+ * Scripts/svn-unapply:
+ (patch): Only delete added file if the diff has text chunks.
+
</ins><span class="cx"> 2014-09-09 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Unreviewed GTK gardening.
</span></span></pre></div>
<a id="trunkToolsScriptssvnapply"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/svn-apply (173437 => 173438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/svn-apply 2014-09-09 19:51:15 UTC (rev 173437)
+++ trunk/Tools/Scripts/svn-apply 2014-09-09 20:12:56 UTC (rev 173438)
</span><span class="lines">@@ -353,10 +353,10 @@
</span><span class="cx"> } elsif ($deletion) {
</span><span class="cx"> applyPatch($patch, $fullPath, ["--force"]) if $patch;
</span><span class="cx"> scmRemove($fullPath);
</span><del>- } elsif ($addition) {
</del><ins>+ } elsif ($addition && $hasTextChunks) {
</ins><span class="cx"> # Addition
</span><span class="cx"> rename($fullPath, "$fullPath.orig") if -e $fullPath;
</span><del>- applyPatch($patch, $fullPath) if $patch;
</del><ins>+ applyPatch($patch, $fullPath);
</ins><span class="cx"> unlink("$fullPath.orig") if -e "$fullPath.orig" && checksum($fullPath) eq checksum("$fullPath.orig");
</span><span class="cx"> scmAdd($fullPath);
</span><span class="cx"> my $escapedFullPath = escapeSubversionPath("$fullPath.orig");
</span></span></pre></div>
<a id="trunkToolsScriptssvnunapply"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/svn-unapply (173437 => 173438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/svn-unapply 2014-09-09 19:51:15 UTC (rev 173437)
+++ trunk/Tools/Scripts/svn-unapply 2014-09-09 20:12:56 UTC (rev 173438)
</span><span class="lines">@@ -200,13 +200,13 @@
</span><span class="cx">
</span><span class="cx"> # Show status if the file is modifed
</span><span class="cx"> system "svn", "stat", $escapedFullPath;
</span><del>- } elsif ($addition) {
</del><ins>+ } elsif ($addition && $hasTextChunks) {
</ins><span class="cx"> # Reverse addition
</span><span class="cx"> #
</span><span class="cx"> # FIXME: This should use the same logic as svn-apply's deletion
</span><span class="cx"> # code. In particular, svn-apply's scmRemove() subroutine
</span><span class="cx"> # should be used here.
</span><del>- unapplyPatch($patch, $fullPath, ["--force"]) if $patch;
</del><ins>+ unapplyPatch($patch, $fullPath, ["--force"]);
</ins><span class="cx"> unlink($fullPath) if -z $fullPath;
</span><span class="cx"> system "svn", "revert", $escapedFullPath;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>