From cff8228b441532d3a338ab2a2dc96a9ec1493d94 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Tue, 20 Dec 2011 14:42:00 +0000 Subject: [PATCH] Better git reset --- common.py | 2 +- metadata/net.osmand.plus.txt | 5 +++-- metadata/tuioDroid.impl.txt | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/common.py b/common.py index 148a383b..43630e1b 100644 --- a/common.py +++ b/common.py @@ -91,7 +91,7 @@ class vcs_git(vcs): def reset(self, rev=None): if rev is None: - rev = 'HEAD' + rev = 'origin' if subprocess.call(['git', 'reset', '--hard', rev], cwd=self.local) != 0: print "Git reset failed" diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt index 49809a2f..bb7c09a1 100644 --- a/metadata/net.osmand.plus.txt +++ b/metadata/net.osmand.plus.txt @@ -20,6 +20,7 @@ Build Version:0.6.7,37,v0.6.7,subdir=OsmAnd,encoding=utf-8,prebuild=mkdir raw,pa Build Version:0.6.8,39,v0.6.8,subdir=OsmAnd,encoding=utf-8,prebuild=mkdir raw Build Version:0.6.8',41,!No corresponding source for whatever this is Build Version:0.6.9,42,v0.6.9,subdir=OsmAnd,encoding=utf-8,prebuild=mkdir raw +Build Version:0.6.9',43,!No corresponding source for whatever this is -Market Version:0.6.9 -Market Version Code:42 +Market Version:0.6.9' +Market Version Code:43 diff --git a/metadata/tuioDroid.impl.txt b/metadata/tuioDroid.impl.txt index 46187fca..2152f44e 100644 --- a/metadata/tuioDroid.impl.txt +++ b/metadata/tuioDroid.impl.txt @@ -15,3 +15,5 @@ Repo:http://tuiodroid.googlecode.com/svn/trunk/ Build Version:1.0,4,28,subdir=TUIOdroid,prebuild=rm -rf bin && rm -rf gen,target=android-11 +Market Version:1.0 +Market Version Code:4 -- 2.30.2