scm.py - Issue 10169034: Fix an error in gclient revert where a directory is unexpected and locked

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: scm.py

Issue 10169034: Fix an error in gclient revert where a directory is unexpected and locked (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Created 8 years, 8 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

Download patch

Index: scm.py

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

index 2addcefefc763b11f8a36742e08f630f6a2e1049..b1b0496f4f5d1a8f666cbc88645c77a0180db926 100644

--- a/scm.py

+++ b/scm.py

@@ -1024,6 +1024,11 @@ class SVN(object):

logging.info('Ignoring external %s' % file_status[1])

continue

+ # This is the case where '! L .' is returned by 'svn status'. Just

+ # strip off the '/.'.

+ if file_path.endswith(os.path.sep + '.'):

+ file_path = file_path[:-2]

if callback:

callback(file_status)

« no previous file with comments | « no previous file | tests/gclient_scm_test.py » ('j') | no next file with comments »