llvm.org GIT mirror llvm / 7472c76
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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@225737 91177308-0d34-0410-b5e6-96231b3b80d8 Hans Wennborg 4 years ago
1 changed file(s) with 6 addition(s) and 4 deletion(s). Raw diff Collapse all Expand all
6565 cd $proj.src
6666 echo "# Updating tree"
6767 svn up
68 echo "# Merging r$rev into $proj"
68 echo "# Merging r$rev into $proj locally"
6969 svn merge -c $rev https://llvm.org/svn/llvm-project/$proj/trunk . || exit 1
70 echo "# Committing changes"
71 svn commit -F $tempfile || exit 1
72 rm -f $tempfile
70
71 echo
72 echo "# To commit the merge, run the following in $proj.src/:"
73 echo svn commit -F $tempfile
74
7375 exit 0