| Index: tools/merge-to-branch.sh
|
| diff --git a/tools/merge-to-branch.sh b/tools/merge-to-branch.sh
|
| index e0011edff02d382559172eee478bd4a9efb48750..f9984c7bb57af42c6d6ddf656c40a5b85aa94756 100755
|
| --- a/tools/merge-to-branch.sh
|
| +++ b/tools/merge-to-branch.sh
|
| @@ -200,12 +200,12 @@ if [ $START_STEP -le $CURRENT_STEP ] ; then
|
| echo ">>> Step $CURRENT_STEP: Increment version number."
|
| restore_if_unset "PATCH"
|
| NEWPATCH=$(($PATCH + 1))
|
| - confirm "Automatically increment PATCH_LEVEL? (Saying 'n' will fire up \
|
| + confirm "Automatically increment V8_PATCH_LEVEL? (Saying 'n' will fire up \
|
| 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
|
| echo $NEWPATCH $VERSION_FILE
|
| - sed -e "/#define PATCH_LEVEL/s/[0-9]*$/$NEWPATCH/" \
|
| + sed -e "/#define V8_PATCH_LEVEL/s/[0-9]*$/$NEWPATCH/" \
|
| -i.bak "$VERSION_FILE" || die "Could not increment patch level"
|
| else
|
| $EDITOR "$VERSION_FILE"
|
|
|