[llvm-commits] [llvm] r142155 - /llvm/trunk/utils/release/merge.sh
Bill Wendling
isanbard at gmail.com
Sun Oct 16 13:59:25 PDT 2011
Author: void
Date: Sun Oct 16 15:59:25 2011
New Revision: 142155
URL: http://llvm.org/viewvc/llvm-project?rev=142155&view=rev
Log:
Update the tree before applying patch.
Modified:
llvm/trunk/utils/release/merge.sh
Modified: llvm/trunk/utils/release/merge.sh
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/release/merge.sh?rev=142155&r1=142154&r2=142155&view=diff
==============================================================================
--- llvm/trunk/utils/release/merge.sh (original)
+++ llvm/trunk/utils/release/merge.sh Sun Oct 16 15:59:25 2011
@@ -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"
More information about the llvm-commits
mailing list