tools/push-to-trunk/test_scripts.py - Issue 181603002: Fix patch creation in merge-to-branch script.

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: tools/push-to-trunk/test_scripts.py

Issue 181603002: Fix patch creation in merge-to-branch script. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Created 6 years, 10 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: tools/push-to-trunk/test_scripts.py

diff --git a/tools/push-to-trunk/test_scripts.py b/tools/push-to-trunk/test_scripts.py

index 8e47d468a9f196654d3c400d3a6af836da2eb497..2cc08bacb015ec6f6ffdebb1e7fdce3104d36d41 100644

--- a/tools/push-to-trunk/test_scripts.py

+++ b/tools/push-to-trunk/test_scripts.py

@@ -950,9 +950,9 @@ LOG=N

["log -1 -p hash1", "patch1"],

["apply --index --reject \"%s\"" % TEST_CONFIG[TEMPORARY_PATCH_FILE],

"", VerifyPatch("patch1")],

- ["log -1 -p hash5", "patch5"],

+ ["log -1 -p hash5", "patch5\n"],

["apply --index --reject \"%s\"" % TEST_CONFIG[TEMPORARY_PATCH_FILE],

- "", VerifyPatch("patch5")],

+ "", VerifyPatch("patch5\n")],

["apply --index --reject \"%s\"" % extra_patch, ""],

["commit -aF \"%s\"" % TEST_CONFIG[COMMITMSG_FILE], ""],

["cl upload --send-mail -r \"reviewer@chromium.org\"", ""],

« no previous file with comments | « tools/push-to-trunk/merge_to_branch.py ('k') | no next file » | no next file with comments »