Show More
@@ -2441,16 +2441,13 b' def amend(ui, repo, old, extra, pats, op' | |||
|
2441 | 2441 | extra.update(wctx.extra()) |
|
2442 | 2442 | |
|
2443 | 2443 | user = opts.get('user') or old.user() |
|
2444 | date = opts.get('date') or old.date() | |
|
2445 | ||
|
2446 | if ui.configbool('rewrite', 'update-timestamp'): | |
|
2444 | ||
|
2447 | 2445 |
|
|
2448 | pass | |
|
2449 | else: | |
|
2446 | date = dateutil.parsedate(opts.get('date')) | |
|
2447 | elif ui.configbool('rewrite', 'update-timestamp'): | |
|
2450 | 2448 |
|
|
2451 | ||
|
2452 | # Parse the date to allow comparison between date and old.date() | |
|
2453 | date = dateutil.parsedate(date) | |
|
2449 | else: | |
|
2450 | date = old.date() | |
|
2454 | 2451 | |
|
2455 | 2452 | if len(old.parents()) > 1: |
|
2456 | 2453 | # ctx.files() isn't reliable for merges, so fall back to the |
General Comments 0
You need to be logged in to leave comments.
Login now