tools/push-to-trunk/push_to_trunk.py - Issue 199993005: Fix branch for resetting 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/push_to_trunk.py

Issue 199993005: Fix branch for resetting 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/push_to_trunk.py

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

index ce1773447e423619b102740e24c9a3e210e1b7cf..eca699315964e7646b9ed1fc2265978eaf1b94ca 100755

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

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

@@ -318,7 +318,7 @@ class AddChangeLog(Step):

# The change log has been modified by the patch. Reset it to the version

# on trunk and apply the exact changes determined by this PrepareChangeLog

# step above.

- self.GitCheckoutFile(self.Config(CHANGELOG_FILE))

+ self.GitCheckoutFile(self.Config(CHANGELOG_FILE), "svn/trunk")

changelog_entry = FileToText(self.Config(NEW_CHANGELOG_FILE))

old_change_log = FileToText(self.Config(CHANGELOG_FILE))

new_change_log = "%s\n\n\n%s" % (changelog_entry, old_change_log)

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