Revert r104938 "Make svn update not prompt during a sync."
I'm not sure if it's causing the tree blow up but I'm not taking any chance.
TBR=dpranke@chromium.org
BUG=
TEST=
Review URL: http://codereview.chromium.org/8228017
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@104956 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/gclient_scm.py b/gclient_scm.py
index c33793c..95890a4 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -994,24 +994,8 @@
new_command = command[:]
if revision:
new_command.extend(['--revision', str(revision).strip()])
- # We don't want interaction when jobs are used.
- if options.jobs > 1:
- new_command.append('--non-interactive')
# --force was added to 'svn update' in svn 1.5.
- # --accept was added to 'svn update' in svn 1.6.
- if not scm.SVN.AssertVersion('1.5')[0]:
- return new_command
-
- # It's annoying to have it block in the middle of a sync, just sensible
- # defaults.
- if options.force:
+ if ((options.force or options.manually_grab_svn_rev) and
+ scm.SVN.AssertVersion("1.5")[0]):
new_command.append('--force')
- if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
- new_command.extend(('--accept', 'theirs-conflict'))
- elif options.manually_grab_svn_rev:
- new_command.append('--force')
- if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
- new_command.extend(('--accept', 'postpone'))
- elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
- new_command.extend(('--accept', 'postpone'))
return new_command