[llvm] r225737 - Release merge script: don't actually commit the merge

[Hans Wennborg]

Author: hans
Date: Mon Jan 12 18:07:31 2015
New Revision: 225737

URL: http://llvm.org/viewvc/llvm-project?rev=225737&view=rev
Log:
Release merge script: don't actually commit the merge

Instead, just present the command for committing it. This way,
the user can test the merge locally, resolve conflicts, etc.
before committing, which seems much safer to me.

Modified:
    llvm/trunk/utils/release/merge.sh

Modified: llvm/trunk/utils/release/merge.sh
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/release/merge.sh?rev=225737&r1=225736&r2=225737&view=diff
==============================================================================
--- llvm/trunk/utils/release/merge.sh (original)
+++ llvm/trunk/utils/release/merge.sh Mon Jan 12 18:07:31 2015
@@ -66,9 +66,11 @@ svn log -c $rev http://llvm.org/svn/llvm
 cd $proj.src
 echo "# Updating tree"
 svn up
-echo "# Merging r$rev into $proj"
+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