Revision: 12615
Author: [email protected]
Date: Wed Sep 26 04:19:35 2012
Log: Fix silently failing branch merge script on Mac
[email protected]
Review URL: https://chromiumcodereview.appspot.com/10981034
http://code.google.com/p/v8/source/detail?r=12615
Modified:
/branches/bleeding_edge/tools/merge-to-branch.sh
=======================================
--- /branches/bleeding_edge/tools/merge-to-branch.sh Thu Mar 29 00:01:36
2012
+++ /branches/bleeding_edge/tools/merge-to-branch.sh Wed Sep 26 04:19:35
2012
@@ -205,8 +205,9 @@
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/" \
- -i "$VERSION_FILE"
+ -i.bak "$VERSION_FILE" || die "Could not increment patch level"
else
$EDITOR "$VERSION_FILE"
fi
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
