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

gclient_scm.py

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Gclient-specific SCM-specific operations."""
 
 import logging
 import os
 import posixpath
 import re
@@ skipping 976 matching lines @@
 
   @staticmethod
   def _AddAdditionalUpdateFlags(command, options, revision):
     """Add additional flags to command depending on what options are set.
     command should be a list of strings that represents an svn command.
 
     This method returns a new list to be used as a command."""
     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