patch.py - Issue 10962038: Fix applying git diff with new file mode 644 on a svn checkout.

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: patch.py

Issue 10962038: Fix applying git diff with new file mode 644 on a svn checkout. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Created 8 years, 3 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: patch.py

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

index 44282ddaf1a04b041fce16d680be7a3d927bb0ef..54f5d175a6caa0c619ec85183c3587b16401f87c 100644

--- a/patch.py

+++ b/patch.py

@@ -406,7 +406,9 @@ class FilePatchDiff(FilePatchBase):

# Only look at owner ACL for executable.

if bool(int(mode[4]) & 1):

self.svn_properties.append(('svn:executable', '*'))

- else:

+ elif not self.source_filename and self.is_new:

+ # It's a new file, not from a rename/copy, then there's no property to

+ # delete.

self.svn_properties.append(('svn:executable', None))

return

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