Fix scm.SVN.GetCheckoutRoot() so it is not confused by intermixed checkouts

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.
 
 """SCM-specific utility classes."""
 
 import cStringIO
 import glob
 import logging
 import os
@@ skipping 788 matching lines @@
     return values
 
   @staticmethod
   def GetCheckoutRoot(directory):
     """Returns the top level directory of the current repository.
 
     The directory is returned as an absolute path.
     """
     directory = os.path.abspath(directory)
     try:
-      cur_dir_repo_root = SVN.CaptureInfo(directory)['Repository Root']
+      info = SVN.CaptureInfo(directory)
+      cur_dir_repo_root = info['Repository Root']
+      url = info['URL']
     except gclient_utils.Error:
       return None
     while True:
       parent = os.path.dirname(directory)
       try:
-        if SVN.CaptureInfo(parent)['Repository Root'] != cur_dir_repo_root:
+        info = SVN.CaptureInfo(parent)
+        if (info['Repository Root'] != cur_dir_repo_root or
+            info['URL'] != os.path.dirname(url)):
           break
+        url = info['URL']
       except gclient_utils.Error:
         break
       directory = parent
     return GetCasedPath(directory)
 
   @staticmethod
   def AssertVersion(min_version):
     """Asserts svn's version is at least min_version."""
     def only_int(val):
       if val.isdigit():
@@ skipping 48 matching lines @@
         elif os.path.isfile(file_path) or os.path.islink(file_path):
           logging.info('os.remove(%s)' % file_path)
           os.remove(file_path)
         elif os.path.isdir(file_path):
           logging.info('gclient_utils.RemoveDirectory(%s)' % file_path)
           gclient_utils.RemoveDirectory(file_path)
         else:
           logging.critical(
             ('No idea what is %s.\nYou just found a bug in gclient'
              ', please ping maruel@chromium.org ASAP!') % file_path)