From 348fa48c2ece3b9a1974ece43b3163a28a784639 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sat, 1 Mar 2014 18:49:23 +0000 Subject: [PATCH] Updated mergedevbranch script, to be able to add a descriptive commit comment if missing from the original commit message. - Legacy-Id: 7384 --- bin/mergedevbranch | 7 +++++++ ready-for-merge | 1 + 2 files changed, 8 insertions(+) diff --git a/bin/mergedevbranch b/bin/mergedevbranch index e1e80f159..da7590c93 100755 --- a/bin/mergedevbranch +++ b/bin/mergedevbranch @@ -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 diff --git a/ready-for-merge b/ready-for-merge index d8cdd8cf4..714c4c91f 100644 --- a/ready-for-merge +++ b/ready-for-merge @@ -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