X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=utils%2Frelease%2Fmerge.sh;h=93e08c7ce135735064cf68697676bccf5025beb1;hp=6ef7d26d5a714d5f87604b3d8809705feeaa3528;hb=4d1ef71f362e014aaaaefeb36abe83c24b578e40;hpb=9a498947cdb25737faecfdabcb64848432c49d68;ds=inline diff --git a/utils/release/merge.sh b/utils/release/merge.sh index 6ef7d26d5a7..93e08c7ce13 100755 --- a/utils/release/merge.sh +++ b/utils/release/merge.sh @@ -72,7 +72,7 @@ else fi svn log -c $rev http://llvm.org/svn/llvm-project/$proj/trunk >> $tempfile 2>&1 -#cd $proj.src +cd $proj.src echo "# Updating tree" svn up @@ -81,7 +81,7 @@ if [ $revert = "yes" ]; then svn merge -c -$rev . || exit 1 else echo "# Merging r$rev into $proj locally" - svn merge -c $rev https://jamesm@llvm.org/svn/llvm-project/$proj/trunk . || exit 1 + svn merge -c $rev https://llvm.org/svn/llvm-project/$proj/trunk . || exit 1 fi echo