tools/push-to-trunk/merge_to_branch.py - Issue 266083003: Remove old branch logic from push scripts.

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 266083003: Remove old branch logic from push scripts. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Fix logging subprocesses. Created 6 years, 8 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 ac02b547ad0b58ecfe9617b3a34f90f6e8212d58..bd9531fb93ad0f1094684d7d7e704e0434afa454 100755

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

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

@@ -41,7 +41,6 @@ CONFIG = {

PERSISTFILE_BASENAME: "/tmp/v8-merge-to-branch-tempfile",

ALREADY_MERGING_SENTINEL_FILE:

"/tmp/v8-merge-to-branch-tempfile-already-merging",

- TEMP_BRANCH: "prepare-merge-temporary-branch-created-by-script",

DOT_GIT_LOCATION: ".git",

VERSION_FILE: "src/version.cc",

TEMPORARY_PATCH_FILE: "/tmp/v8-prepare-merge-tempfile-temporary-patch",

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