Ignore unversioned files when switching a repository.

Review URL: http://codereview.chromium.org/3132004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@55573 0039d316-1c4b-4281-b951-d872f2087c98

gclient_scm.py

@@ -793,11 +793,14 @@ class SVNWrapper(SCMWrapper):
             from_info['Repository Root'],
             to_info['Repository Root'])
       else:
-        if scm.SVN.CaptureStatus(checkout_path) and not options.force:
+        if not options.force:
-          raise gclient_utils.Error("Can't switch the checkout to %s; UUID "
+          # Look for local modifications but ignore unversioned files.
-                                    "don't match and there is local changes "
+          for status in scm.SVN.CaptureStatus(checkout_path):
-                                    "in %s. Delete the directory and "
+            if status[0] != '?':
-                                    "try again." % (url, checkout_path))
+              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)