Commit 21dca0e7 authored by morrita@chromium.org's avatar morrita@chromium.org

Skipped syncing svn working copy which has a .hg subdirectory.

BUG=57783
TEST=none
Review URL: http://codereview.chromium.org/3601007

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@61459 0039d316-1c4b-4281-b951-d872f2087c98
parent cf1982cb
......@@ -681,12 +681,17 @@ class SVNWrapper(SCMWrapper):
Raises:
Error: if can't get URL for relative path.
"""
# Only update if git is not controlling the directory.
# Only update if git or hg is not controlling the directory.
git_path = os.path.join(self.checkout_path, '.git')
if os.path.exists(git_path):
print('________ found .git directory; skipping %s' % self.relpath)
return
hg_path = os.path.join(self.checkout_path, '.hg')
if os.path.exists(hg_path):
print('________ found .hg directory; skipping %s' % self.relpath)
return
if args:
raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment