From 4d1ef71f362e014aaaaefeb36abe83c24b578e40 Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Tue, 26 Jan 2016 19:44:49 +0000 Subject: [PATCH] Revert accidental changes from r258805 git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_38@258844 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/release/merge.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- 2.34.1