tools/push-to-trunk/common_includes.py - Issue 605943002: Fix git interface for merge 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/common_includes.py

Issue 605943002: Fix git interface for merge script. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Created 6 years, 3 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/common_includes.py

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

index 312bc24ad5c0baf9004ebee6e0bdd0572d8c11f4..7ea39f73c95e80c86e10eb960241dc3e7683b76d 100644

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

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

@@ -371,6 +371,8 @@ class GitReadOnlyMixin(VCInterface):

return "origin/candidates"

def RemoteBranch(self, name):

+ if name in ["candidates", "master"]:

+ return "origin/%s" % name

return "origin/branch-heads/%s" % name

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