| Index: update_depot_tools.bat
|
| diff --git a/update_depot_tools.bat b/update_depot_tools.bat
|
| index 1560eb78ac7163ea66c1ec85cea63359b045ebe3..33fa40b220e8755ec693c924dc135e8a0e7be6c0 100644
|
| --- a/update_depot_tools.bat
|
| +++ b/update_depot_tools.bat
|
| @@ -38,7 +38,12 @@ goto :EOF
|
|
|
|
|
| :SVN_UPDATE
|
| -call svn up -q "%DEPOT_TOOLS_DIR%."
|
| +FOR %%A IN (%*) DO (
|
| + IF "%%A" == "--force" (
|
| + call svn -q revert -R "%DEPOT_TOOLS_DIR%."
|
| + )
|
| +)
|
| +call svn -q up "%DEPOT_TOOLS_DIR%."
|
| goto :EOF
|
|
|
|
|
| @@ -58,9 +63,9 @@ for /F %%x in ('git config --get remote.origin.url') DO (
|
| call git fetch -q origin > NUL
|
| call git rebase -q origin/master > NUL
|
| if errorlevel 1 echo Failed to update depot_tools.
|
| -
|
| goto :EOF
|
|
|
| +
|
| :GIT_SVN_UPDATE
|
| cd /d "%DEPOT_TOOLS_DIR%."
|
| call git svn rebase -q -q
|
|
|