tools/common-includes.sh - Issue 10073010: Small improvements to push-to-trunk.sh and 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 10073010: Small improvements to push-to-trunk.sh and merge-to-branch.sh. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

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

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

index d1b8b01473bd85e536130b7191904a15e2192a20..2b806caa5f44e143ebf70b7d25e55f27786b98b8 100644

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

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

@@ -184,7 +184,8 @@ the uploaded CL."

apply_patch() {

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")

+ tee < "$PATCH_OUTPUT_FILE" >(grep "patching file" \

+ | awk '{print $NF}' >> "$TOUCHED_FILES_FILE")

rm "$PATCH_OUTPUT_FILE"

}

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