From 231034879fd0ba1d7323927baba43571f112ef40 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Sun, 21 Apr 2013 15:01:53 +0000
Subject: [PATCH] Tweaked the mergedevbranch script.  - Legacy-Id: 5679

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

diff --git a/bin/mergedevbranch b/bin/mergedevbranch
index 81b2ee710..b118fb618 100755
--- a/bin/mergedevbranch
+++ b/bin/mergedevbranch
@@ -142,8 +142,13 @@ echo -e "#!/bin/bash\n\nsvn commit -m \"Merged [$rev] from $who: ${comment/\"/\'
 chmod +x ../cicmd/commit-${rev}-merge.sh
 
 note "Do the merge:"
-svn merge -c $rev ${repo}/$branch . || die "Merge of $branch @$rev failed.  The merge command was:
- svn merge -c $rev ${repo}/$branch ."
+if [[ $rev =~ : ]]; then
+    svn merge -r $rev ${repo}/$branch . || die "Merge of $branch @$rev failed.  The merge command was:
+  svn merge -r $rev ${repo}/$branch ."
+else
+    svn merge -c $rev ${repo}/$branch . || die "Merge of $branch @$rev failed.  The merge command was:
+  svn merge -c $rev ${repo}/$branch ."
+fi
 
 M=$(svn st | cut -c 1-7 | grep -oh 'M' | head -n 1)
 C=$(svn st | cut -c 1-7 | grep -oh 'C' | head -n 1)