tools/merge-to-branch.sh - Issue 10981034: Fix silently failing branch merge script on Mac

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 10981034: Fix silently failing branch merge script on Mac (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Created 8 years, 3 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 aa590a313ca096311e1d1b81c3b51087895e28ea..6794add8828dcdb728a451f161709f1008f310da 100755

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

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

@@ -206,7 +206,7 @@ your EDITOR on $VERSION_FILE so you can make arbitrary changes. When \

you're done, save the file and exit your EDITOR.)"

if [ $? -eq 0 ] ; then

sed -e "/#define PATCH_LEVEL/s/[0-9]*$/$NEWPATCH/" \

- -i "$VERSION_FILE"

+ -i.bak "$VERSION_FILE" || die "Could not increment patch level"

else

$EDITOR "$VERSION_FILE"

« no previous file with comments | « no previous file | no next file » | no next file with comments »