[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[oliver at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit d5d6ebb10a5aa54a59270f44d7023aca1fd04e5f
Author: oliver at apple.com <oliver at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 10 04:25:23 2009 +0000

    Make do-webcore-rename work with git.
    
    Reviewed by Geoff Garen.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50713 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9aee456..5b04d10 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-09  Oliver Hunt  <oliver at apple.com>
+
+        Reviewed by Geoff Garen.
+
+        Make do-webcore-rename work with git.
+
+        * Scripts/do-webcore-rename:
+
 2009-11-09  Simon Hausmann  <simon.hausmann at nokia.com>
 
         Adding Kenneth to the reviewers list.
diff --git a/WebKitTools/Scripts/do-webcore-rename b/WebKitTools/Scripts/do-webcore-rename
index 2d6ca46..6c004e8 100755
--- a/WebKitTools/Scripts/do-webcore-rename
+++ b/WebKitTools/Scripts/do-webcore-rename
@@ -33,6 +33,7 @@ use FindBin;
 use lib $FindBin::Bin;
 use webkitdirs;
 use File::Find;
+use VCSUtils;
 
 setConfiguration();
 chdirWebKit();
@@ -150,11 +151,18 @@ for my $file (sort @paths) {
     }
 }
 
+
+my $isGit = isGit();
+
 for my $file (sort @paths) {
     if ($newFile{$file}) {
         my $newFile = $newFile{$file};
         print "Renaming $file to $newFile\n";
-        system "svn move $file $newFile";
+        if ($isGit) {
+            system "git mv $file $newFile";
+        } else {
+            system "svn move $file $newFile";
+        }
     }
 }
 

-- 
WebKit Debian packaging