diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-24 20:51:42 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-24 20:51:42 +0000 |
| commit | 059e58b90c883044a0efe8ebaf599ca1a2352833 (patch) | |
| tree | 2502591c363370e59b30d21f420797c7675160fd | |
| parent | b6017553f63bf49fc76b2e7fa64d5d1ca0fb1e72 (diff) | |
| download | chromium_src-059e58b90c883044a0efe8ebaf599ca1a2352833.zip chromium_src-059e58b90c883044a0efe8ebaf599ca1a2352833.tar.gz chromium_src-059e58b90c883044a0efe8ebaf599ca1a2352833.tar.bz2 | |
Explicitly use "--diff-cmd diff" on svn diff, so the script will work correctly even for people who have a custom svn differ (e.g. WinDiff).
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/174341
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24142 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/tools/layout_tests/rebaseline.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/tools/layout_tests/rebaseline.py b/webkit/tools/layout_tests/rebaseline.py index 0ec3126..162d0b7 100644 --- a/webkit/tools/layout_tests/rebaseline.py +++ b/webkit/tools/layout_tests/rebaseline.py @@ -478,7 +478,8 @@ class Rebaseliner(object): # Get the diff between old and new baselines and save to the html directory. if baseline_filename.upper().endswith('.TXT'): - output = RunShell(['svn', 'diff', baseline_fullpath]) + output = RunShell(['svn', 'diff', '--diff-cmd', 'diff', + baseline_fullpath]) if output: diff_file = GetResultFileFullpath(self._options.html_directory, baseline_filename, |