chiark / gitweb /
Better git reset
authorCiaran Gultnieks <ciaran@ciarang.com>
Tue, 20 Dec 2011 14:42:00 +0000 (14:42 +0000)
committerCiaran Gultnieks <ciaran@ciarang.com>
Tue, 20 Dec 2011 14:42:00 +0000 (14:42 +0000)
common.py
metadata/net.osmand.plus.txt
metadata/tuioDroid.impl.txt

index 148a383b4e26b4ad68194cb12c7716e422918904..43630e1bc2ccb61a3aab4f587a234f8c7b906826 100644 (file)
--- 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"
index 49809a2f94379c4c02ebcb6d5ed212973066170b..bb7c09a1ae03a7d730f51badb32d625549b8e657 100644 (file)
@@ -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
index 46187fca591f3ae4b61b64f5e7a79b017984d7f8..2152f44e177807546904f57547eaa437a9279829 100644 (file)
@@ -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