diff --git a/build-scripts/sync_git_hg.sh b/build-scripts/sync_git_hg.sh old mode 100755 new mode 100644 index 385a4338e8..41d4405fda --- a/build-scripts/sync_git_hg.sh +++ b/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" diff --git a/build-scripts/update_git.sh b/build-scripts/update_git.sh old mode 100755 new mode 100644 index 51243837ce..0a42e78dfa --- a/build-scripts/update_git.sh +++ b/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}