[llvm-branch-commits] [llvm-branch] r258844 - Revert accidental changes from r258805

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Tue Jan 26 13:44:49 2016
New Revision: 258844

URL: http://llvm.org/viewvc/llvm-project?rev=258844&view=rev
Log:
Revert accidental changes from r258805

Modified:
    llvm/branches/release_38/utils/release/merge.sh

Modified: llvm/branches/release_38/utils/release/merge.sh
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/utils/release/merge.sh?rev=258844&r1=258843&r2=258844&view=diff
==============================================================================
--- llvm/branches/release_38/utils/release/merge.sh (original)
+++ llvm/branches/release_38/utils/release/merge.sh Tue Jan 26 13:44:49 2016
@@ -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