From cad20a9ac1a14ffebc0f271c169224296b686a12 Mon Sep 17 00:00:00 2001
From: batt <batt@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Fri, 7 Nov 2008 16:22:47 +0000
Subject: [PATCH] Add local modification test.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1910 38d2e660-2303-0410-9eaa-f027e97ec537
---
 bertos/remote_merge | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/bertos/remote_merge b/bertos/remote_merge
index 1c4e869a..5afde9b2 100755
--- a/bertos/remote_merge
+++ b/bertos/remote_merge
@@ -5,6 +5,7 @@ if [ $# -lt 2 ] ; then
 	printf "\nMerge remote url commits into local BeRTOS svn repository.\n"
 	printf "Usage: $0 <REMOTE_URL> <REMOTE_START_REV> [<REMOTE_END_REV>]\n"
 	printf "If remote end revision is not supplied HEAD will be used.\n"
+	exit 1
 fi
 
 
@@ -16,6 +17,13 @@ else
 	END_REV="$3"
 fi
 
+#Check for local uncommitted modifications
+STATUS=`svn status -q`
+if [[ z"$STATUS" != z && "${STATUS:0:1}" != $'\n' ]] ; then
+	printf "Project has local modifications, it must be clean\n"
+	exit 1
+fi
+
 #Get list of revisions to merge.
 REV_LIST=`svn log $MERGE_URL -r$START_REV:$END_REV --quiet 2>&1| perl -ne 'if(m/^r([0-9]+)/) {print $1, "\n";}'`
 
-- 
2.25.1