##// END OF EJS Templates
cmdutil: fix amend when passing a date...
Boris Feld -
r34123:ae95853c default
parent child Browse files
Show More
@@ -3059,6 +3059,9 b' def amend(ui, repo, old, extra, pats, op'
3059 user = opts.get('user') or old.user()
3059 user = opts.get('user') or old.user()
3060 date = opts.get('date') or old.date()
3060 date = opts.get('date') or old.date()
3061
3061
3062 # Parse the date to allow comparison between date and old.date()
3063 date = util.parsedate(date)
3064
3062 if len(old.parents()) > 1:
3065 if len(old.parents()) > 1:
3063 # ctx.files() isn't reliable for merges, so fall back to the
3066 # ctx.files() isn't reliable for merges, so fall back to the
3064 # slower repo.status() method
3067 # slower repo.status() method
@@ -85,6 +85,14 b' Nothing changed'
85 nothing changed
85 nothing changed
86 [1]
86 [1]
87
87
88 $ hg amend -d "0 0"
89 nothing changed
90 [1]
91
92 $ hg amend -d "Thu Jan 01 00:00:00 1970 UTC"
93 nothing changed
94 [1]
95
88 Matcher and metadata options
96 Matcher and metadata options
89
97
90 $ echo 3 > C
98 $ echo 3 > C
General Comments 0
You need to be logged in to leave comments. Login now