Skip to content

Commit 348fa48

Browse files
committed
Updated mergedevbranch script, to be able to add a descriptive commit comment if missing from the original commit message.
- Legacy-Id: 7384
1 parent b91524f commit 348fa48

2 files changed

Lines changed: 8 additions & 0 deletions

File tree

bin/mergedevbranch

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,13 @@ read -p "Continue with diff? [Y/n] "
149149
note "Diff:"
150150
svn diff -c $rev $repo/$branch | less
151151
152+
read -p "Additional descriptive text (hit return for none): "
153+
if [ $REPLY != "" ]; then
154+
comment="$REPLY
155+
156+
$comment"
157+
fi
158+
152159
echo ""
153160
read -p "Continue with the merge? [Y/n] "
154161
[ "$REPLY" = "Y" -o "$REPLY" = "y" -o "$REPLY" = "" ] || exit

ready-for-merge

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77

88
# --- Add entries at the top ---
99

10+
personal/rcross/v5.0.2@7378
1011
personal/jmh/v5.0.2@7375
1112
personal/rjs/v4.90@7138 Was waiting for additional tests

0 commit comments

Comments
 (0)