Commit 5fd42e65 authored by bweinstein@apple.com's avatar bweinstein@apple.com

2009-10-02 Brian Weinstein <bweinstein@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
parent 37904a52
2009-10-02 Brian Weinstein <bweinstein@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@gmail.com>
Reviewed by Simon Hausmann.
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment