From 2718eb31fdd39e416a59d50359dbb24ede305cf1 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Fri, 21 Mar 2014 11:24:32 +0000
Subject: [PATCH] Tweaked merge helper script.  - Legacy-Id: 7530

---
 bin/mergedevbranch | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bin/mergedevbranch b/bin/mergedevbranch
index 6d9f7cecd..c63798f20 100755
--- a/bin/mergedevbranch
+++ b/bin/mergedevbranch
@@ -184,7 +184,9 @@ cp cicmd/commit-${rev}-merge.sh merged@$rev/commit
 cd -
 
 echo -e "\nRunning tests"
-ietf/manage.py test --settings=settings_sqlitetest || die "Tests failed.\nThe commit script is ../cicmd/commit-${rev}-merge.sh"
+time ietf/manage.py test --settings=settings_sqlitetest || die "Tests failed.\nThe commit script is ../cicmd/commit-${rev}-merge.sh"
+
+
 
 note "Sending email to changeset author: <$who>"
 mail -s "Merged datatracker branch personal/$branch@$rev to trunk" $who -c henrik@levkowetz.com <<-EOF
@@ -200,6 +202,10 @@ Regards,
 	(via the mergesprintbranch script)
 EOF
 
+echo ""
+read -p "Continue with the commit? [Y/n] "
+[ "$REPLY" = "Y" -o  "$REPLY" = "y" -o  "$REPLY" = "" ] || ARG_COMMIT=0
+
 if [ "$ARG_COMMIT" != 0 ]; then
     echo "Committing the merge:"
     echo ""