small changes to work with various situations

build-scripts/sync_git_hg.sh

@@ -18,7 +18,7 @@ hg update -c
 # [paths]
 # default = git://github.com/osmandapp/Osmand.git
 # googlecode = https://username:password@osmand.googlecode.com/hg
-hg push googlecode
+hg push -f googlecode
 
 echo "Synchronization is ok"
 

build-scripts/update_git.sh

@@ -11,6 +11,7 @@ if [ ! -d "$GIT_DIR" ]; then
 fi
 # update git
 cd "${GIT_DIR}"
+git reset --hard
 git checkout master
 git pull ${GIT_ORIGIN_NAME}