tools/release/test_scripts.py - Issue 925313002: Fix branch name in 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/release/test_scripts.py

Issue 925313002: Fix branch name in merge script. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master

Patch Set: Created 5 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/release/test_scripts.py

diff --git a/tools/release/test_scripts.py b/tools/release/test_scripts.py

index 58d1911a80c46fd2cda845ea22327764d297aa77..524ed25a91d714fae6cc40d51d8443f6f5ca7a85 100644

--- a/tools/release/test_scripts.py

+++ b/tools/release/test_scripts.py

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

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

Cmd("git fetch", ""),

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

- Cmd("git new-branch %s --upstream origin/candidates" %

+ Cmd("git new-branch %s --upstream refs/remotes/origin/candidates" %

TEST_CONFIG["BRANCHNAME"], ""),

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

"--reverse origin/master"),

@@ -1253,12 +1253,12 @@ LOG=N

Cmd("git fetch", ""),

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

"Version 3.22.5.1 (cherry-pick)"

- "\" origin/candidates",

+ "\" refs/remotes/origin/candidates",

""),

Cmd("git fetch", ""),

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

"Version 3.22.5.1 (cherry-pick)"

- "\" origin/candidates",

+ "\" refs/remotes/origin/candidates",

"hsh_to_tag"),

Cmd("git tag 3.22.5.1 hsh_to_tag", ""),

Cmd("git push origin 3.22.5.1", ""),

« no previous file with comments | « tools/release/common_includes.py ('k') | no next file » | no next file with comments »