Fix gclient to correctly check out remote refs during update.

gclient_scm.py

 # Copyright (c) 2012 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."""
 
 from __future__ import print_function
 
 import logging
 import os
@@ skipping 323 matching lines @@
     if options.verbose:
       self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
       verbose = ['--verbose']
       printed_path = True
 
     url = self._CreateOrUpdateCache(url, options)
 
     if revision.startswith('refs/'):
       rev_type = "branch"
     elif revision.startswith(self.remote + '/'):
       # For compatibility with old naming, translate 'origin' to 'refs/heads'

[ghost stip (do not use), 2014/04/21 21:26:57]

you should change this comment to reflect the new logic

[smut, 2014/04/21 21:28:43]

This comment is no longer applicable.

[agable, 2014/04/21 21:31:22]

Done.

-      revision = revision.replace(self.remote + '/', 'refs/heads/')
+      revision = 'refs/remotes/' + revision
       rev_type = "branch"
     else:
       # hash is also a tag, only make a distinction at checkout
       rev_type = "hash"
 
     if (not os.path.exists(self.checkout_path) or
         (os.path.isdir(self.checkout_path) and
          not os.path.exists(os.path.join(self.checkout_path, '.git')))):
       if (os.path.isdir(self.checkout_path) and
           not os.path.exists(os.path.join(self.checkout_path, '.git'))):
@@ skipping 1102 matching lines @@
       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