tools/push-to-trunk/test_scripts.py - Issue 201633002: Fix maintaining change log in push-to-trunk.

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 201633002: Fix maintaining change log in push-to-trunk. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Created 6 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: 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 cff0a9ad9b3aca2bfd5b2e34904594d87e2894f2..d2a29dac3da94822d40e11c67ff220c7914e5160 100644

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

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

@@ -741,7 +741,7 @@ Performance and stability improvements on all platforms.""", commit)

Git("checkout -b %s svn/trunk" % TEST_CONFIG[TRUNKBRANCH], "",

cb=ResetChangeLog),

Git("apply --index --reject \"%s\"" % TEST_CONFIG[PATCH_FILE], ""),

- Git("checkout -- %s" % TEST_CONFIG[CHANGELOG_FILE], "",

+ Git("checkout -f -- %s" % TEST_CONFIG[CHANGELOG_FILE], "",

cb=ResetChangeLog),

Git("add \"%s\"" % TEST_CONFIG[VERSION_FILE], ""),

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

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