From 51779e923ffed4c2aa62b0fce7d97a24a07668c9 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Tue, 21 Jun 2016 18:55:43 +0000
Subject: [PATCH] Tweaked the mergedevbranch script.  - Legacy-Id: 11442

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

diff --git a/bin/mergedevbranch b/bin/mergedevbranch
index 0f94242f9..d005850dd 100755
--- a/bin/mergedevbranch
+++ b/bin/mergedevbranch
@@ -113,6 +113,10 @@ cwd=${PWD##*/}
 branch=$1
 rev=$2
 fix=$3
+
+# remove leading 'r' from rev, if present
+rev=${rev#r}
+
 repo=$(echo -n "$(svn info | grep "^Repository Root: " | sed 's/Repository Root: //')")
 
 note "Identify the branch:"
@@ -128,6 +132,9 @@ else
     die "Could not find a branch matching '$branch'"
 fi
 
+note "Svn update, to make sure we don't have a mixed revision working copy"
+svn update -q
+
 mergelog=$(mktemp)
 svn propget svn:mergeinfo . > $mergelog