Don't delete directories that have been superseded by a broader checkout.

gclient.py

Index: gclient.py
diff --git a/gclient.py b/gclient.py
index 242cf0f2f7b6e0abddf9ad39504e6ce7584c89ae..3bdf44eacdae7153d2d5406cb5e998c410a50c74 100755
--- a/gclient.py
+++ b/gclient.py
@@ -1134,6 +1134,9 @@ solutions = [
       # Only delete the directory if there are no changes in it, and
       # delete_unversioned_trees is set to true.
       entries = [i.name for i in self.root.subtree(False) if i.url]
+      full_entries = [os.path.join(self.root_dir, e.replace('/', os.path.sep))
+                          for e in entries]

[M-A Ruel, 2013/05/06 17:07:05]

alignment

+
       for entry, prev_url in self._ReadEntries().iteritems():
         if not prev_url:
           # entry must have been overridden via .gclient custom_deps
@@ -1152,8 +1155,13 @@ solutions = [
         if (entry not in entries and
             (not any(path.startswith(entry + '/') for path in entries)) and
             os.path.exists(e_dir)):
-          file_list = []
           scm = gclient_scm.CreateSCM(prev_url, self.root_dir, entry_fixed)
+
+          # Check to see if this directory is now part of a higher-up checkout.
+          if scm.GetCheckoutRoot() in full_entries:

[M-A Ruel, 2013/05/06 17:07:05]

Add a logging.info() here.

Also, I'm not sure it works well. In theory it should work well with entries
that have been removed since GetCheckoutRoot() should behave properly, but that
is only if the SCM matches. In case of git/svn mismatch, anything can happen.

GetCheckoutRoot() will return a primary entry even if
os.path.join(self.root_dir, entry_fixed) is not a versioned directory anymore.
It's even worse in mismatch, since the function will search for a parent up to
'/', especially in git case. For svn, I think the returned value will differ if
>=1.7 or not.

[Dirk Pranke, 2013/05/06 19:44:35]

I don't follow this comment. Can you give a specific example?

+            continue
+
+          file_list = []
           scm.status(self._options, [], file_list)
           modified_files = file_list != []
           if (not self._options.delete_unversioned_trees or