--- a/mercurial/cmdutil.py	Mon Jan 07 21:57:23 2019 +0900
+++ b/mercurial/cmdutil.py	Mon Jan 07 21:29:58 2019 +0900
@@ -2441,16 +2441,13 @@
         extra.update(wctx.extra())
 
         user = opts.get('user') or old.user()
-        date = opts.get('date') or old.date()
-
-        if ui.configbool('rewrite', 'update-timestamp'):
-            if opts.get('date'):
-                pass
-            else:
-                date = dateutil.makedate()
-
-        # Parse the date to allow comparison between date and old.date()
-        date = dateutil.parsedate(date)
+
+        if opts.get('date'):
+            date = dateutil.parsedate(opts.get('date'))
+        elif ui.configbool('rewrite', 'update-timestamp'):
+            date = dateutil.makedate()
+        else:
+            date = old.date()
 
         if len(old.parents()) > 1:
             # ctx.files() isn't reliable for merges, so fall back to the