Merge lp:~jelmer/brz/ancient-time into lp:brz/3.0

[Jelmer Vernooij]

Fix conversion of time_t to int on certain platforms.

Fix conversion of time_t to int on certain platforms.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/bzr/_dirstate_helpers_pyx.pyx'
--- breezy/bzr/_dirstate_helpers_pyx.pyx	2019-11-18 06:20:31 +0000
+++ breezy/bzr/_dirstate_helpers_pyx.pyx	2020-01-23 03:26:48 +0000
@@ -797,10 +797,8 @@
 
 
 cdef unsigned long _time_to_unsigned(object t):  # cannot_raise
-    cdef double dt
     if PyFloat_Check(t):
-        dt = PyFloat_AsDouble(t)
-        return <unsigned long>dt
+        t = t.__int__()
     return PyInt_AsUnsignedLongMask(t)
 
 
 
=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2019-12-23 03:05:20 +0000
+++ doc/en/release-notes/brz-3.0.txt	2020-01-23 03:26:48 +0000
@@ -40,6 +40,9 @@
  * Don't rely on private transport attribute in fast-import.
    (Jelmer Vernooij, #1854607)
 
+ * Fix conversion of time_t to int on certain platforms (arm64, armhf,
+   ppc64el). (Jelmer Vernooij)
+
 Documentation
 *************