Updated mergedevbranch script, to be able to add a descriptive commit comment if missing from the original commit message.

- Legacy-Id: 7384
This commit is contained in:
Henrik Levkowetz 2014-03-01 18:49:23 +00:00
parent b91524fabc
commit 348fa48c2e
2 changed files with 8 additions and 0 deletions

View file

@ -149,6 +149,13 @@ read -p "Continue with diff? [Y/n] "
note "Diff:"
svn diff -c $rev $repo/$branch | less
read -p "Additional descriptive text (hit return for none): "
if [ $REPLY != "" ]; then
comment="$REPLY
$comment"
fi
echo ""
read -p "Continue with the merge? [Y/n] "
[ "$REPLY" = "Y" -o "$REPLY" = "y" -o "$REPLY" = "" ] || exit

View file

@ -7,5 +7,6 @@
# --- Add entries at the top ---
personal/rcross/v5.0.2@7378
personal/jmh/v5.0.2@7375
personal/rjs/v4.90@7138 Was waiting for additional tests