equal
deleted
inserted
replaced
6335 if rev is not None: |
6335 if rev is not None: |
6336 raise util.Abort(_("you can't specify a revision and a date")) |
6336 raise util.Abort(_("you can't specify a revision and a date")) |
6337 rev = cmdutil.finddate(ui, repo, date) |
6337 rev = cmdutil.finddate(ui, repo, date) |
6338 |
6338 |
6339 if check: |
6339 if check: |
6340 c = repo[None] |
6340 cmdutil.bailifchanged(repo, merge=False) |
6341 if c.dirty(merge=False, branch=False, missing=True): |
|
6342 raise util.Abort(_("uncommitted changes")) |
|
6343 if rev is None: |
6341 if rev is None: |
6344 rev = repo[repo[None].branch()].rev() |
6342 rev = repo[repo[None].branch()].rev() |
6345 |
6343 |
6346 repo.ui.setconfig('ui', 'forcemerge', tool, 'update') |
6344 repo.ui.setconfig('ui', 'forcemerge', tool, 'update') |
6347 |
6345 |