Revert accidental changes from r258805

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_38@258844 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/utils/release/merge.sh b/utils/release/merge.sh
index 6ef7d26d5a714d5f87604b3d8809705feeaa3528..93e08c7ce135735064cf68697676bccf5025beb1 100755 (executable)
--- 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
 
 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
 
 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 . || 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
 fi
 
 echo