Index: gclient_scm.py |
=================================================================== |
--- gclient_scm.py (revision 61448) |
+++ gclient_scm.py (working copy) |
@@ -681,12 +681,17 @@ |
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)) |