Bugfix in gclient_scm.py: Remove the correct directories if svn checkout is in a broken state

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."""
 
 import collections
 import logging
 import os
 import posixpath
@@ skipping 1212 matching lines @@
       except subprocess2.CalledProcessError, e:
         # Get the status again, svn cleanup may have cleaned up at least
         # something.
         dir_info = scm.SVN.CaptureStatus(
             None, os.path.join(self.checkout_path, '.'))
 
         # Try to fix the failures by removing troublesome files.
         for d in dir_info:
           if d[0][2] == 'L':
             if d[0][0] == '!' and options.force:
-              print 'Removing troublesome path %s' % d[1]
-              gclient_utils.rmtree(d[1])
+              # We don't pass any files/directories to CaptureStatus and set
+              # cwd=self.checkout_path, so we should get relative paths here.
+              assert not os.path.isabs(d[1])
+              path_to_remove = os.path.normpath(
+                  os.path.join(self.checkout_path, d[1]))
+              print 'Removing troublesome path %s' % path_to_remove
+              gclient_utils.rmtree(path_to_remove)
             else:
               print 'Not removing troublesome path %s automatically.' % d[1]
               if d[0][0] == '!':
                 print 'You can pass --force to enable automatic removal.'
               raise e
 
     # Retrieve the current HEAD version because svn is slow at null updates.
     if options.manually_grab_svn_rev and not revision:
       from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
       revision = str(from_info_live['Revision'])
@@ skipping 224 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