Skip to content

Commit 1c2f990

Browse files
committed
Tweaked the bin/mergedevbranch to add a pause to permit fixes to merged code before running tests.
- Legacy-Id: 15740
1 parent 753f34f commit 1c2f990

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

bin/mergedevbranch

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,9 @@ G=$(svn st | cut -c 1-7 | grep -oh 'G' | head -n 1)
192192
##cp cicmd/commit-${rev}-merge.sh merged@$rev/commit
193193
##cd -
194194
195+
read -p "Continue with tests? [Y/n] "
196+
[ "$REPLY" = "Y" -o "$REPLY" = "y" -o "$REPLY" = "" ] || exit
197+
195198
echo -e "\nRunning tests"
196199
time { ietf/manage.py test --settings=settings_sqlitetest \
197200
|| die "Tests failed.\nThe commit script is ../cicmd/commit-${rev}-merge.sh"; } 3>&1 1>&2 2>&3 | bin/count

0 commit comments

Comments
 (0)