From eeb58a7e6be5de3f792fc074b5efeb926d0d3e15 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Sun, 16 Oct 2011 20:59:25 +0000 Subject: 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/release/merge.sh b/utils/release/merge.sh index a6b716e3d3..2cf39b282a 100755 --- 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" -- cgit v1.2.3