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

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

index e9aa81ee5bd7174f7a523535a69cdc63f06badb5..f129891e1dc1293289c16c1ad60fb9479797a2c2 100644

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

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

@@ -1203,7 +1203,7 @@ LOG=N

Cmd("git status -s -b -uno", "## some_branch\n"),

Cmd("git fetch", ""),

Cmd("git branch", " branch1\n* branch2\n"),

- Cmd("git checkout -b %s origin/branch-heads/candidates" %

+ Cmd("git checkout -b %s origin/candidates" %

TEST_CONFIG["BRANCHNAME"], ""),

Cmd(("git log --format=%H --grep=\"Port r12345\" "

"--reverse origin/master"),

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