Mercurial > hg-stable
changeset 6231:5e5ce714ba95
merge with main
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Tue, 11 Mar 2008 23:59:43 +0100 |
| parents | bd61e44eb2cc (current diff) 210ee6204a29 (diff) |
| children | 59200a2de7bf |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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):