From 9292041be1e6156219d5022784ce1b1417370f5d Mon Sep 17 00:00:00 2001 From: "tony@chromium.org" Date: Fri, 4 Jun 2010 05:08:56 +0000 Subject: [PATCH] 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 --- gclient_scm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gclient_scm.py b/gclient_scm.py index a145f308c0..56f2119f12 100644 --- a/gclient_scm.py +++ b/gclient_scm.py @@ -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 "