Commit c2a96f41 authored by ddkilzer@apple.com's avatar ddkilzer@apple.com

Fix resolve-ChangeLogs when used with Subversion

        Reviewed by Darin Adler.

        Fixes the following issue when run on a Subversion repository:

            $ ./WebKitTools/Scripts/resolve-ChangeLogs
            ERROR: --continue may only be used with a git repository

        * Scripts/resolve-ChangeLogs: Check for the boolean value of
        $gitRebaseContinue, not whether it's defined, when validating
        command-line switches.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@43636 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent d7b77145
2009-05-13 David Kilzer <ddkilzer@apple.com>
Fix resolve-ChangeLogs when used with Subversion
Reviewed by Darin Adler.
Fixes the following issue when run on a Subversion repository:
$ ./WebKitTools/Scripts/resolve-ChangeLogs
ERROR: --continue may only be used with a git repository
* Scripts/resolve-ChangeLogs: Check for the boolean value of
$gitRebaseContinue, not whether it's defined, when validating
command-line switches.
2009-05-12 David Kilzer <ddkilzer@apple.com>
Bug 21418: resolve-ChangeLogs should have a --continue option which does git rebase --continue
......
......@@ -85,7 +85,7 @@ if (scalar(@ARGV) > 0) {
} elsif (!defined $fixMerged && scalar(@changeLogFiles) == 0) {
print STDERR "ERROR: No ChangeLog files listed on command-line or found unmerged.\n";
undef $getOptionsResult;
} elsif (defined $gitRebaseContinue && !$isGit) {
} elsif ($gitRebaseContinue && !$isGit) {
print STDERR "ERROR: --continue may only be used with a git repository\n";
undef $getOptionsResult;
} elsif (defined $fixMerged && !$isGit) {
......
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