Ignore unversioned files when switching a repository.

gclient_scm.py

 # Copyright (c) 2010 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 775 matching lines @@
         # TODO(maruel):  TEST ME !
         command = ["switch", "--relocate",
                    from_info['Repository Root'],
                    to_info['Repository Root'],
                    self.relpath]
         scm.SVN.Run(command, self._root_dir)
         from_info['URL'] = from_info['URL'].replace(
             from_info['Repository Root'],
             to_info['Repository Root'])
       else:
-        if scm.SVN.CaptureStatus(checkout_path) and not options.force:
-          raise gclient_utils.Error("Can't switch the checkout to %s; UUID "
-                                    "don't match and there is local changes "
-                                    "in %s. Delete the directory and "
-                                    "try again." % (url, checkout_path))
+        if not options.force:
+          # Look for local modifications but ignore unversioned files.
+          for status in scm.SVN.CaptureStatus(checkout_path):
+            if status[0] != '?':
+              raise gclient_utils.Error(
+                  ('Can\'t switch the checkout to %s; UUID don\'t match and '
+                   'there is local changes in %s. Delete the directory and '
+                   'try again.') % (url, checkout_path))
         # Ok delete it.
         print("\n_____ switching %s to a new checkout" % self.relpath)
         gclient_utils.RemoveDirectory(checkout_path)
         # We need to checkout.
         command = ['checkout', url, checkout_path]
         command = self.AddAdditionalFlags(command, options, revision)
         scm.SVN.RunAndGetFileList(options, command, self._root_dir, file_list)
         return
 
 
@@ skipping 123 matching lines @@
     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()])
     # --force was added to 'svn update' in svn 1.5.
     if options.force and scm.SVN.AssertVersion("1.5")[0]:
       new_command.append('--force')
     return new_command