[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[bweinstein at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 5fd42e6538f47d2188dc2739aaf3d98dba6cc5c1
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 2 17:57:37 2009 +0000

    2009-10-02  Brian Weinstein  <bweinstein at apple.com>
    
            Reviewed by Adam Roben.
    
            svn-create-patch should have an --ignore-changelogs to not add ChangeLogs to the diff,
            this will help the patch merging process when TryBots are used.
    
            * Scripts/svn-create-patch:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49028 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 740c15b..cac839d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-02  Brian Weinstein  <bweinstein at apple.com>
+
+        Reviewed by Adam Roben.
+
+        svn-create-patch should have an --ignore-changelogs to not add ChangeLogs to the diff,
+        this will help the patch merging process when TryBots are used.
+
+        * Scripts/svn-create-patch:
+
 2009-10-02  Jakub Wieczorek  <faw217 at gmail.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKitTools/Scripts/svn-create-patch b/WebKitTools/Scripts/svn-create-patch
index e91f00d..3f40783 100755
--- a/WebKitTools/Scripts/svn-create-patch
+++ b/WebKitTools/Scripts/svn-create-patch
@@ -77,13 +77,15 @@ sub testfilecmp($$);
 $ENV{'LC_ALL'} = 'C';
 
 my $showHelp;
+my $ignoreChangelogs = 0;
 my $devNull = File::Spec->devnull();
 
 my $result = GetOptions(
     "help"       => \$showHelp,
+    "ignore-changelogs"    => \$ignoreChangelogs
 );
 if (!$result || $showHelp) {
-    print STDERR basename($0) . " [-h|--help] [svndir1 [svndir2 ...]]\n";
+    print STDERR basename($0) . " [-h|--help] [--ignore-changelogs] [svndir1 [svndir2 ...]]\n";
     exit 1;
 }
 
@@ -264,6 +266,11 @@ sub generateDiff($$)
 {
     my ($fileData, $prefix) = @_;
     my $file = File::Spec->catdir($prefix, $fileData->{path});
+    
+    if ($ignoreChangelogs && basename($file) eq "ChangeLog") {
+        return;
+    }
+    
     my $patch;
     if ($fileData->{modificationType} eq "additionWithHistory") {
         manufacturePatchForAdditionWithHistory($fileData);

-- 
WebKit Debian packaging