apply_issue.py - Issue 10391033: Improve error message in patch application failure.

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

Issue 10391033: Improve error message in patch application failure. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

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

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

index 5bf72197be69d2c99f44c63fd49d09656b6acfea..22d6945d651e258a6b0d4af35952d457eecf7294 100755

--- a/apply_issue.py

+++ b/apply_issue.py

@@ -69,7 +69,11 @@ def main():

parser.error('Couldn\'t determine the scm')

# Apply the patch.

- scm_obj.apply_patch(patchset)

+ try:

+ scm_obj.apply_patch(patchset)

+ except checkout.PatchApplicationFailed, e:

+ print >> sys.stderr, str(e)

+ return 1

return 0

« no previous file with comments | « no previous file | checkout.py » ('j') | no next file with comments »