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

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

index 5f2e573bdc4e40c3bb924d3abfec21f497dd74ed..7e0e51f982c7b5e247a09e31e09d6a0ad385d36f 100755

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

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

@@ -182,7 +182,7 @@ class ApplyPatches(Step):

for commit_hash in self["patch_commit_hashes"]:

print("Applying patch for %s to %s..."

% (commit_hash, self["merge_to_branch"]))

- patch = self.GitLog(n=1, patch=True, git_hash=commit_hash)

+ patch = self.GitGetPatch(commit_hash)

TextToFile(patch, self.Config(TEMPORARY_PATCH_FILE))

self.ApplyPatch(self.Config(TEMPORARY_PATCH_FILE), self._options.revert)

if self._options.patch:

« 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 »