Changeset 1910

Timestamp:

11/07/08 17:22:47 (2 months ago)

Author:

batt

Message:

Add local modification test.

Files:

• trunk/bertos/remote_merge (modified) (2 diffs)

trunk/bertos/remote_merge

@@ -6 +6 @@
-        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
-
@@ -15 +16 @@
-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
-