Rollback trunk to bleeding_edge revision 12525

tools/merge-to-branch.sh

Index: tools/merge-to-branch.sh
diff --git a/tools/merge-to-branch.sh b/tools/merge-to-branch.sh
old mode 100644
new mode 100755
index d26fbcc4069c2bb99bb4da8b28a3653e5a55e6a1..aa590a313ca096311e1d1b81c3b51087895e28ea
--- a/tools/merge-to-branch.sh
+++ b/tools/merge-to-branch.sh
@@ -205,9 +205,8 @@ if [ $START_STEP -le $CURRENT_STEP ] ; then
 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.bak "$VERSION_FILE" || die "Could not increment patch level"
+        -i "$VERSION_FILE"
   else
     $EDITOR "$VERSION_FILE"
   fi