projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix xmega initialization procedure.
[bertos.git]
/
bertos
/
remote_merge
diff --git
a/bertos/remote_merge
b/bertos/remote_merge
index 1c4e869ab93c56b526d3d48915bf8ce1f74b7274..5afde9b27bf0784c59aba576467a16e7e72353f8 100755
(executable)
--- 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"
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
fi
@@
-16,6
+17,13
@@
else
END_REV="$3"
fi
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";}'`
#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";}'`