Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/cmdutil.py
changeset 41173 4145fd3569c3
parent 41125 126101284e04
child 41206 6acbe86c6490 
--- a/mercurial/cmdutil.py	Fri Jan 04 17:54:18 2019 +0100
+++ b/mercurial/cmdutil.py	Thu Jan 10 21:32:37 2019 +0900
@@ -2450,7 +2450,8 @@
             date = dateutil.parsedate(opts.get('date'))
         elif opts.get('currentdate'):
             date = dateutil.makedate()
-        elif ui.configbool('rewrite', 'update-timestamp'):
+        elif (ui.configbool('rewrite', 'update-timestamp')
+              and opts.get('currentdate') is None):
             date = dateutil.makedate()
             datemaydiffer = True
         else:
Mercurial