tools/common-includes.sh - Issue 9839056: Support reverse patching in merge-to-branch.sh

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/common-includes.sh

Issue 9839056: Support reverse patching in merge-to-branch.sh (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Created 8 years, 9 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/common-includes.sh

diff --git a/tools/common-includes.sh b/tools/common-includes.sh

index 8f0e78b60180bcbf5a678870113b0e43b7faa3a7..c7d5bc2d3dc379cf9942f9ffa0e4a89367d97f51 100644

--- a/tools/common-includes.sh

+++ b/tools/common-includes.sh

@@ -175,7 +175,7 @@ the uploaded CL."

# Takes a file containing the patch to apply as first argument.

apply_patch() {

- patch -p1 < "$1" > "$PATCH_OUTPUT_FILE" || \

+ patch $REVERSE_PATCH -p1 < "$1" > "$PATCH_OUTPUT_FILE" || \

{ cat "$PATCH_OUTPUT_FILE" && die "Applying the patch failed."; }

tee < "$PATCH_OUTPUT_FILE" >(awk '{print $NF}' >> "$TOUCHED_FILES_FILE")

rm "$PATCH_OUTPUT_FILE"

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