scm.py - Issue 6650011: Add code to correctly revert a svn add'ed file.

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 6650011: Add code to correctly revert a svn add'ed file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

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

Index: scm.py

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

index 471b9d7475e333fae4dcf1a4b608729fcb1d2d39..aaab02c088c3ad30fa48c00fa6f85ad49b8f7ed3 100644

--- a/scm.py

+++ b/scm.py

@@ -878,7 +878,7 @@ class SVN(object):

# svn revert is really stupid. It fails on inconsistent line-endings,

# on switched directories, etc. So take no chance and delete everything!

- if file_status[0][0] in ('D', 'A') or file_status[0][2] != ' ':

+ if file_status[0][0] in ('D', 'A', '!') or file_status[0][2] != ' ':

# Added, deleted file requires manual intervention and require calling

# revert, like for properties.

try:

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