Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with main
authorThomas Arendsen Hein <thomas@intevation.de>
Tue, 11 Mar 2008 23:59:43 +0100
changeset 6231 5e5ce714ba95
parent 6226 bd61e44eb2cc (current diff)
parent 6224 210ee6204a29 (diff)
child 6232 59200a2de7bf
merge with main
--- a/mercurial/util.py	Tue Mar 11 11:38:12 2008 -0700
+++ b/mercurial/util.py	Tue Mar 11 23:59:43 2008 +0100
@@ -1532,7 +1532,7 @@
     t, tz = date or makedate()
     s = time.strftime(format, time.gmtime(float(t) - tz))
     if timezone:
-        s += timezone_format % (-tz / 3600, ((-tz % 3600) / 60))
+        s += timezone_format % (int(-tz / 3600.0), ((-tz % 3600) / 60))
     return s
 
 def shortdate(date=None):
mercurial