Take 2 at adding --force to svn update and svn checkout.
Turns out that this was added in svn 1.5 and the mac bots
use svn 1.4.4.
Review URL: http://codereview.chromium.org/2623002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48899 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py
index 175f8e9..bd49add 100755
--- a/tests/gclient_scm_test.py
+++ b/tests/gclient_scm_test.py
@@ -68,7 +68,7 @@
def testDir(self):
members = [
- 'FullUrlForRelativeUrl', 'RunCommand',
+ 'AddAdditionalFlags', 'FullUrlForRelativeUrl', 'RunCommand',
'cleanup', 'diff', 'export', 'pack', 'relpath', 'revert',
'revinfo', 'runhooks', 'scm_name', 'status', 'update',
'updatesingle', 'url',
@@ -266,6 +266,8 @@
additional_args = []
if options.manually_grab_svn_rev:
additional_args = ['--revision', str(file_info['Revision'])]
+ if options.force and gclient_scm.scm.SVN.AssertVersion("1.5")[0]:
+ additional_args.append('--force')
files_list = []
gclient_scm.scm.SVN.RunAndGetFileList(
options,