Merged r19443 into trunk branch.

tools/merge-to-branch.sh

 #!/bin/bash
 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
@@ skipping 217 matching lines @@
   persist "NEW_COMMIT_MSG"
   persist "REVISION_LIST"
   persist_patch_commit_hashes
 fi
 
 let CURRENT_STEP+=1
 if [ $START_STEP -le $CURRENT_STEP ] ; then
   echo ">>> Step $CURRENT_STEP: Apply patches for selected revisions."
   restore_if_unset "MERGE_TO_BRANCH"
   restore_patch_commit_hashes_if_unset "PATCH_COMMIT_HASHES"
-  rm -f "$TOUCHED_FILES_FILE"
   for HASH in ${PATCH_COMMIT_HASHES[@]} ; do
     echo "Applying patch for $HASH to $MERGE_TO_BRANCH..."
     git log -1 -p $HASH > "$TEMPORARY_PATCH_FILE"
     apply_patch "$TEMPORARY_PATCH_FILE"
   done
   if [ -n "$EXTRA_PATCH" ] ; then
     apply_patch "$EXTRA_PATCH"
   fi
 fi
 
@@ skipping 85 matching lines @@
   restore_version_if_unset "NEW"
   common_cleanup
   if [ $REVERT_FROM_BLEEDING_EDGE==0 ] ; then
     echo "*** SUMMARY ***"
     echo "version: $NEWMAJOR.$NEWMINOR.$NEWBUILD.$NEWPATCH"
     echo "branch: $TO_URL"
     echo "svn revision: $SVN_REVISION"
     [[ -n "$REVISION_LIST" ]] && echo "patches:$REVISION_LIST"
   fi
 fi