Commit 9292041b authored by tony@chromium.org's avatar tony@chromium.org

Make gclient sync --force also ignore left over files when

switching repositories.  This could result in clobbering
changes you may have in a third_party checkout, but if
you pass --force, I think you're asking for this behavior.
Review URL: http://codereview.chromium.org/2645001

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48902 0039d316-1c4b-4281-b951-d872f2087c98
parent 99828125
......@@ -787,7 +787,7 @@ class SVNWrapper(SCMWrapper):
from_info['Repository Root'],
to_info['Repository Root'])
else:
if scm.SVN.CaptureStatus(checkout_path):
if scm.SVN.CaptureStatus(checkout_path) and not options.force:
raise gclient_utils.Error("Can't switch the checkout to %s; UUID "
"don't match and there is local changes "
"in %s. Delete the directory and "
......
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