[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[dbates at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 52f0c38cd7bd63d08d23a72445600a0237564cb2
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 26 20:58:03 2010 +0000

    2010-07-26  Daniel Bates  <dbates at rim.com>
    
            Reviewed by Darin Adler.
    
            svn-unapply warns of uninitialized variable when unapplying
            a patch that describes an svn move operation
            https://bugs.webkit.org/show_bug.cgi?id=42036
    
            Fixes Perl uninitialized variable warnings when un-applying
            a patch that moves a file.
    
            * Scripts/svn-unapply:
              - Modified patch() so that it initializes $patch to the empty
                string when we don't have svnConvertedText (such as when
                reversing a diff that represents a svn copy/move operation).
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64072 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index a58effd..4142f3b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,19 @@
+2010-07-26  Daniel Bates  <dbates at rim.com>
+
+        Reviewed by Darin Adler.
+
+        svn-unapply warns of uninitialized variable when unapplying
+        a patch that describes an svn move operation
+        https://bugs.webkit.org/show_bug.cgi?id=42036
+
+        Fixes Perl uninitialized variable warnings when un-applying
+        a patch that moves a file.
+
+        * Scripts/svn-unapply:
+          - Modified patch() so that it initializes $patch to the empty
+            string when we don't have svnConvertedText (such as when
+            reversing a diff that represents a svn copy/move operation).
+
 2010-07-26  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKitTools/Scripts/svn-unapply b/WebKitTools/Scripts/svn-unapply
index e502560..53ab1b5 100755
--- a/WebKitTools/Scripts/svn-unapply
+++ b/WebKitTools/Scripts/svn-unapply
@@ -139,7 +139,9 @@ sub patch($)
 {
     my ($diffHashRef) = @_;
 
-    my $patch = $diffHashRef->{svnConvertedText};
+    # Make sure $patch is initialized to some value.  There is no
+    # svnConvertedText when reversing an svn copy/move.
+    my $patch = $diffHashRef->{svnConvertedText} || "";
 
     my $fullPath = $diffHashRef->{indexPath};
     my $isSvnBinary = $diffHashRef->{isBinary} && $diffHashRef->{isSvn};
@@ -201,7 +203,7 @@ sub patch($)
             # FIXME: This should use the same logic as svn-apply's deletion
             #        code.  In particular, svn-apply's scmRemove() subroutine
             #        should be used here.
-            unapplyPatch($patch, $fullPath, ["--force"]);
+            unapplyPatch($patch, $fullPath, ["--force"]) if $patch;
             unlink($fullPath) if -z $fullPath;
             system "svn", "revert", $fullPath;
         }

-- 
WebKit Debian packaging