Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(529)

Unified Diff: tests/gclient_scm_test.py

Issue 2623002: Take 2 at adding --force to svn update and svn checkout.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools/
Patch Set: Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gclient_scm.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/gclient_scm_test.py
===================================================================
--- tests/gclient_scm_test.py (revision 48898)
+++ tests/gclient_scm_test.py (working copy)
@@ -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,
« no previous file with comments | « gclient_scm.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698