Commit 3294f52e authored by maruel@chromium.org's avatar maruel@chromium.org

Make --reset more powerful for svn checkouts

That makes --force less necessary.

Review URL: http://codereview.chromium.org/3160026

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@56581 0039d316-1c4b-4281-b951-d872f2087c98
parent 6133c5b6
......@@ -800,7 +800,7 @@ class SVNWrapper(SCMWrapper):
from_info['Repository Root'],
to_info['Repository Root'])
else:
if not options.force:
if not options.force and not options.reset:
# Look for local modifications but ignore unversioned files.
for status in scm.SVN.CaptureStatus(checkout_path):
if status[0] != '?':
......
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