tools/merge-to-branch.sh - Issue 167463005: Merged r19443 into trunk branch.

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/merge-to-branch.sh

Issue 167463005: Merged r19443 into trunk branch. (Closed) Base URL: https://v8.googlecode.com/svn/trunk

Patch Set: Created 6 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/merge-to-branch.sh

diff --git a/tools/merge-to-branch.sh b/tools/merge-to-branch.sh

index ccdae6c9bcecd917e26f4faf15f2fc66bda83221..4e8a86c83408936e944a2bdfaf936bdef3c0446d 100755

--- a/tools/merge-to-branch.sh

+++ b/tools/merge-to-branch.sh

@@ -235,7 +235,6 @@ if [ $START_STEP -le $CURRENT_STEP ] ; then

echo ">>> Step $CURRENT_STEP: Apply patches for selected revisions."

restore_if_unset "MERGE_TO_BRANCH"

restore_patch_commit_hashes_if_unset "PATCH_COMMIT_HASHES"

- rm -f "$TOUCHED_FILES_FILE"

for HASH in ${PATCH_COMMIT_HASHES[@]} ; do

echo "Applying patch for $HASH to $MERGE_TO_BRANCH..."

git log -1 -p $HASH > "$TEMPORARY_PATCH_FILE"