commit eeb58a7e6be5de3f792fc074b5efeb926d0d3e15
author Bill Wendling <isanbard@gmail.com> Sun Oct 16 20:59:25 2011 +0000
committer Bill Wendling <isanbard@gmail.com> Sun Oct 16 20:59:25 2011 +0000
tree cfebc5292a7bebc94cb70fbf37a1d0c5fea4f353
parent acb10f1519b0944fe7cf1b6060a03b17aab267e2

Update the tree before applying patch.

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

utils/release/merge.sh

diff --git a/utils/release/merge.sh b/utils/release/merge.sh
index a6b716e..2cf39b2 100755
--- a/utils/release/merge.sh
+++ b/utils/release/merge.sh
@@ -64,6 +64,8 @@
 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"