Reapply r104938 "Make svn update not prompt during a sync."

gclient_scm.py

Index: gclient_scm.py
diff --git a/gclient_scm.py b/gclient_scm.py
index 95890a450ce8eb5e79bcd110001508ecec51eac7..c33793c7db4da6cb795d5f53d9466913f03957f8 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -994,8 +994,24 @@ class SVNWrapper(SCMWrapper):
     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.
-    if ((options.force or options.manually_grab_svn_rev) and
-        scm.SVN.AssertVersion("1.5")[0]):
+    # --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:
+      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