Tweaked merge script

- Legacy-Id: 8887
This commit is contained in:
Henrik Levkowetz 2015-01-21 19:45:54 +00:00
parent a41f247ffa
commit f6e97e721c

View file

@ -208,7 +208,8 @@ read -p "Continue with the commit? [Y/n] "
if [ "$ARG_COMMIT" != 0 ]; then
echo "Committing the merge:"
echo ""
svn commit -m "Merged in [$rev] from $who:\n ${comment//\"/\'} ${fix//\"/\'}"
svn commit -m "Merged in [$rev] from $who:
${comment//\"/\'} ${fix//\"/\'}"
else
echo "This merge has not been committed yet."
echo "To commit it, run this commit command: ../cicmd/commit-$rev-merge.sh"