From c63b037461f0b8877a28601b40f0619b3b93e054 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Wed, 4 Feb 2015 22:21:28 +0000
Subject: [PATCH] Tweaked the mergedevbranch script.  - Legacy-Id: 8977

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

diff --git a/bin/mergedevbranch b/bin/mergedevbranch
index ed20b2d70..fbfb4ec5f 100755
--- a/bin/mergedevbranch
+++ b/bin/mergedevbranch
@@ -206,6 +206,8 @@ read -p "Continue with the commit? [Y/n] "
 [ "$REPLY" = "Y" -o  "$REPLY" = "y" -o  "$REPLY" = "" ] || ARG_COMMIT=0
 
 if [ "$ARG_COMMIT" != 0 ]; then
+    echo "Ensuring we're up-to-date:"
+    svn up
     echo "Committing the merge:"
     echo ""
     svn commit -m "Merged in [$rev] from $who: