Release merge script: don't actually commit the merge

[oota-llvm.git] / utils / release / merge.sh

diff --git a/utils/release/merge.sh b/utils/release/merge.sh
index a6b716e3d32d87e34533401c2d9399d070b4bc49..949c29837813415c984bbb0e0fcdbc80dff8b30c 100755 (executable)
--- a/utils/release/merge.sh
+++ b/utils/release/merge.sh
@@ -64,9 +64,13 @@ echo "Merging r$rev:" > $tempfile
 svn log -c $rev http://llvm.org/svn/llvm-project/$proj/trunk >> $tempfile 2>&1
 
 cd $proj.src
-echo "# Merging r$rev into $proj"
+echo "# Updating tree"
+svn up
+echo "# Merging r$rev into $proj locally"
 svn merge -c $rev https://llvm.org/svn/llvm-project/$proj/trunk . || exit 1
-echo "# Committing changes"
-svn commit -F $tempfile || exit 1
-rm -f $tempfile
+
+echo
+echo "# To commit the merge, run the following in $proj.src/:"
+echo svn commit -F $tempfile
+
 exit 0