Revert accidental changes from r258805
authorHans Wennborg <hans@hanshq.net>
Tue, 26 Jan 2016 19:44:49 +0000 (19:44 +0000)
committerHans Wennborg <hans@hanshq.net>
Tue, 26 Jan 2016 19:44:49 +0000 (19:44 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_38@258844 91177308-0d34-0410-b5e6-96231b3b80d8

utils/release/merge.sh

index 6ef7d26..93e08c7 100755 (executable)
@@ -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