Merge with crew
authorMatt Mackall <mpm@selenic.com>
Tue, 11 Mar 2008 17:42:26 -0500
changeset 6227 4c1aa6affe60
parent 6224 210ee6204a29 (diff)
parent 6226 bd61e44eb2cc (current diff)
child 6228 c0c4c7b1e8d3
Merge with crew
--- a/mercurial/util.py	Tue Mar 11 11:38:12 2008 -0700
+++ b/mercurial/util.py	Tue Mar 11 17:42:26 2008 -0500
@@ -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):