From 1c2f9904e62803ecfaaadff053deec1bc27e7c8b Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Fri, 9 Nov 2018 17:37:28 +0000
Subject: [PATCH] Tweaked the bin/mergedevbranch to add a pause to permit fixes
 to merged code before running tests.  - Legacy-Id: 15740

---
 bin/mergedevbranch | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/mergedevbranch b/bin/mergedevbranch
index cec32ae36..0c1aae81f 100755
--- a/bin/mergedevbranch
+++ b/bin/mergedevbranch
@@ -192,6 +192,9 @@ G=$(svn st | cut -c 1-7 | grep -oh 'G' | head -n 1)
 ##cp cicmd/commit-${rev}-merge.sh merged@$rev/commit
 ##cd -
 
+read -p "Continue with tests? [Y/n] "
+[ "$REPLY" = "Y" -o  "$REPLY" = "y" -o  "$REPLY" = "" ] || exit
+
 echo -e "\nRunning tests"
 time { ietf/manage.py test --settings=settings_sqlitetest	\
 	|| die "Tests failed.\nThe commit script is ../cicmd/commit-${rev}-merge.sh"; } 3>&1 1>&2 2>&3 | bin/count