diff options
| author | pamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 19:10:06 +0000 |
|---|---|---|
| committer | pamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 19:10:06 +0000 |
| commit | 5752b6ba9850f6479f5d1e1f6b78d92116591434 (patch) | |
| tree | cb47a277baa1f43116eec1fe56a6f5ebeb406888 /webkit/tools/merge/diff3-wrapper.bat | |
| parent | 5c184a6845df0c3a75f8e2f28e71ab25e5f6f535 (diff) | |
| download | chromium_src-5752b6ba9850f6479f5d1e1f6b78d92116591434.zip chromium_src-5752b6ba9850f6479f5d1e1f6b78d92116591434.tar.gz chromium_src-5752b6ba9850f6479f5d1e1f6b78d92116591434.tar.bz2 | |
Add a .bat script wrapper for the Python diff3 wrapper so it can be called
successfully from svn in Cygwin. (Some people were able to use the .py wrapper
directly, but I can't. I suspect it has to do with file mappings in Windows.)
Change merge.py to use the .bat script, add an --svn option to specify the path
to the right svn executable, and strip trailing whitespace.
Review URL: http://codereview.chromium.org/14830
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7241 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/merge/diff3-wrapper.bat')
| -rw-r--r-- | webkit/tools/merge/diff3-wrapper.bat | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/webkit/tools/merge/diff3-wrapper.bat b/webkit/tools/merge/diff3-wrapper.bat new file mode 100644 index 0000000..3881884 --- /dev/null +++ b/webkit/tools/merge/diff3-wrapper.bat @@ -0,0 +1,10 @@ +@ECHO off + +:: Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +:: Use of this source code is governed by a BSD-style license that can be +:: found in the LICENSE file. + +:: Wrapper around diff3-wrapper.py so it can be called from svn. + +python %~dp0diff3-wrapper.py %* +exit /B %ERRORLEVEL% |