tools/push-to-trunk/merge_to_branch.py - Issue 716153002: Switch release scripts to pure git.

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 716153002: Switch release scripts to pure git. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Review. Created 6 years, 1 month 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 da9d3101a41ab44d9ecafb7848c4ec4f47ad8934..9e7f1fb4f5dbee94669fddf02c81fac8ef370f32 100755

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

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

@@ -276,9 +276,6 @@ class MergeToBranch(ScriptsBase):

# CC ulan to make sure that fixes are merged to Google3.

options.cc = "ulan@chromium.org"

- # Thd old git-svn workflow is deprecated for this script.

- assert options.vc_interface != "git_svn"

# Make sure to use git hashes in the new workflows.

for revision in options.revisions:

if (IsSvnNumber(revision) or