From c979b39badc2f56bf73049b264a361becb0b04a0 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Wed, 8 Jan 2020 14:09:00 +0000
Subject: [PATCH] Added some thoughts on using flake8 as part of the merge
 process.  - Legacy-Id: 17197

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

diff --git a/bin/mergedevbranch b/bin/mergedevbranch
index b01923bfd..5d24b46e9 100755
--- a/bin/mergedevbranch
+++ b/bin/mergedevbranch
@@ -193,6 +193,13 @@ G=$(svn st | cut -c 1-7 | grep -oh 'G' | head -n 1)
 ##cp cicmd/commit-${rev}-merge.sh merged@$rev/commit
 ##cd -
 
+# Potentially run flake8 at this point
+# read -p "Run flake8? [y/N] "
+# if [ "$REPLY" = "Y" -o  "$REPLY" = "y"]; then
+#     mod=$(svn st | cut -c 9- | grep '\.py$')
+#     flake8 $mod | less
+# fi
+
 read -p "Continue with tests? [Y/n] "
 [ "$REPLY" = "Y" -o  "$REPLY" = "y" -o  "$REPLY" = "" ] || exit