tools/push-to-trunk.sh - Issue 11031065: push-to-trunk.sh/merge-to-branch.sh: use "git apply" instead of "patch" to apply patches

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.sh

Issue 11031065: push-to-trunk.sh/merge-to-branch.sh: use "git apply" instead of "patch" to apply patches (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Created 8 years, 2 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:

View side-by-side diff with in-line comments

Download patch

Index: tools/push-to-trunk.sh

diff --git a/tools/push-to-trunk.sh b/tools/push-to-trunk.sh

index a193d57384d7ce1259231a101189a97ffb5f4470..8512d128778d4cad7b26d6c5c5b7bc44f70a7341 100755

--- a/tools/push-to-trunk.sh

+++ b/tools/push-to-trunk.sh

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

echo ">>> Step $CURRENT_STEP: Apply squashed changes."

rm -f "$TOUCHED_FILES_FILE"

apply_patch "$PATCH_FILE"

- stage_files

rm -f "$PATCH_FILE"

« no previous file with comments | « tools/merge-to-branch.sh ('k') | no next file » | no next file with comments »