X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=utils%2Frelease%2Fmerge.sh;h=2cf39b282a71ac3d875e74cd638a57896208a43b;hb=1b0dc64919e947bb4f4677b138c734e33061f7c4;hp=a6b716e3d32d87e34533401c2d9399d070b4bc49;hpb=f4a4e3ae740979ea7877f55e34cdb5abac9cbe33;p=oota-llvm.git diff --git a/utils/release/merge.sh b/utils/release/merge.sh index a6b716e3d32..2cf39b282a7 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"