gclient_scm.py - Issue 3160026: Make --reset more powerful for svn checkouts - Code Review

Chromium Code Reviews

chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out

(669)

My Issues | Starred Open | Closed | All

Unified Diff: gclient_scm.py

Issue 3160026: Make --reset more powerful for svn checkouts (Closed)

Patch Set: Created 10 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gclient_scm.py

diff --git a/gclient_scm.py b/gclient_scm.py

index 74b0281952c530cb2a92e36526d2f15d5d01a46e..93249ffff54277e5ca29c3e2bd88fce4dfbda883 100644

--- a/gclient_scm.py

+++ b/gclient_scm.py

@@ -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] != '?':

« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine

This is Rietveld 408576698