Update the tree before applying patch.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@142155 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/utils/release/merge.sh b/utils/release/merge.sh
index a6b716e3d32d87e34533401c2d9399d070b4bc49..2cf39b282a71ac3d875e74cd638a57896208a43b 100755 (executable)
--- a/utils/release/merge.sh
+++ b/utils/release/merge.sh
@@ -64,6 +64,8 @@ echo "Merging r$rev:" > $tempfile
 svn log -c $rev http://llvm.org/svn/llvm-project/$proj/trunk >> $tempfile 2>&1
 
 cd $proj.src
+echo "# Updating tree"
+svn up
 echo "# Merging r$rev into $proj"
 svn merge -c $rev https://llvm.org/svn/llvm-project/$proj/trunk . || exit 1
 echo "# Committing changes"