Revert of If the destination directory doesn't contain the desired repo, delete it

gclient.py

Index: gclient.py
diff --git a/gclient.py b/gclient.py
index 215e19408d957eb84982505e94f9728cb8d51f5a..d1b5a8733859fb76b7cc28e825b941f19ad8ab01 100755
--- a/gclient.py
+++ b/gclient.py
@@ -87,7 +87,6 @@
 import posixpath
 import pprint
 import re
-import socket
 import sys
 import time
 import urllib
@@ -669,39 +668,6 @@
             command, options, parsed_url, self.parent.name, revision_overrides)
         self._used_scm = gclient_scm.CreateSCM(
             parsed_url, self.root.root_dir, self.name)
-
-        def enable_deletion_of_conflicting_checkouts():
-          """Determines whether to enable new checkout deletion behavior.
-
-          Initially, enables the experimental functionality on a small set of
-          bots.
-          """
-          # TODO(borenet): Remove this hack as soon as we've verified that it
-          # doesn't cause the bots to break.
-          return (os.environ.get('CHROME_HEADLESS') and
-                  socket.gethostname() in ('vm859-m1', 'build1-m1', 'vm630-m1'))
-
-        # When updating, determine whether the destination directory contains a
-        # checkout of the desired repository. If not, avoid conflicts by
-        # deleting the directory before running the update.
-        if command == 'update' and enable_deletion_of_conflicting_checkouts():
-          logging.warning('Experimental deletion of mismatching checkouts '
-                          'enabled.')
-          actual_remote_url = self._used_scm.GetRemoteURL(options)
-          url, _ = gclient_utils.SplitUrlRevision(parsed_url)
-          url = url.rstrip('/')
-          dest_dir = os.path.join(self.root.root_dir, self.name) 
-          if os.path.isdir(dest_dir) and actual_remote_url != url:
-            if options.force:
-              logging.warning('%s does not contain a checkout of %s. Removing '
-                              ' %s' % (dest_dir, url, dest_dir))
-              gclient_utils.rmtree(dest_dir)
-            else:
-              raise gclient_utils.Error('%s does not contain a checkout of %s. '
-                                        'Please fix the solution manually or '
-                                        'run with --force to delete '
-                                        'automatically.' % (dest_dir, url))
-
         self._got_revision = self._used_scm.RunCommand(command, options, args,
                                                        file_list)
         if file_list: