Merge branch 'master' into feature/stringfix

2 files changed, 25 insertions, 3 deletions

diff --git a/helpers/ChangeLog b/helpers/ChangeLog
index a3d6815c..b08dec6c 100644
--- a/helpers/ChangeLog
+++ b/helpers/ChangeLog
@@ -1,3 +1,7 @@
+2017-03-20         Andrew J. Schorr      <aschorr@telemetry-investments.com>
+
+	* update-branches.sh: Robustness improvements.
+
 2017-02-23         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* update-branches.sh: New file.
diff --git a/helpers/update-branches.sh b/helpers/update-branches.sh
index 659da8b8..b08e1f16 100755
--- a/helpers/update-branches.sh
+++ b/helpers/update-branches.sh
@@ -6,14 +6,32 @@ then
 	exit 1
 fi
 
-git checkout master || exit
+doit () {
+	echo "
+	Running: $@"
+	"$@" || {
+		echo "Oops: command [$@] failed with status $?"
+		return 1
+	}
+}
+
+doit git checkout master || exit
 
 features=$(git branch -a | grep /origin/feature/ | sed 's;.*/origin/;;')
 others="porting"
 
 for i in $others $features
 do
-	(git checkout $i && git pull && git merge master && git push) || break
+	echo "
+	Updating branch $i"
+	(doit git checkout $i && doit git pull && doit git merge master && doit git push) || {
+		echo "
+Error encountered updating branch $i.
+Please resolve the conflict and push it manually in a separate window.
+Please hit enter when you are done so we may continue to merge into
+the other branches."
+		read x
+	}
 done
 
-git checkout master || exit
+doit git checkout master