Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 17849:6da47b655d97 stable
update: check for missing files with --check (issue3595)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 22 Oct 2012 17:23:31 -0500 |
parents | 66f0c78350ab |
children | 92ba3cd55be6 |
comparison
equal
deleted
inserted
replaced
17848:66f0c78350ab | 17849:6da47b655d97 |
---|---|
5892 raise util.Abort(_("you can't specify a revision and a date")) | 5892 raise util.Abort(_("you can't specify a revision and a date")) |
5893 rev = cmdutil.finddate(ui, repo, date) | 5893 rev = cmdutil.finddate(ui, repo, date) |
5894 | 5894 |
5895 if check: | 5895 if check: |
5896 c = repo[None] | 5896 c = repo[None] |
5897 if c.dirty(merge=False, branch=False): | 5897 if c.dirty(merge=False, branch=False, missing=True): |
5898 raise util.Abort(_("uncommitted local changes")) | 5898 raise util.Abort(_("uncommitted local changes")) |
5899 if rev is None: | 5899 if rev is None: |
5900 rev = repo[repo[None].branch()].rev() | 5900 rev = repo[repo[None].branch()].rev() |
5901 mergemod._checkunknown(repo, repo[None], repo[rev]) | 5901 mergemod._checkunknown(repo, repo[None], repo[rev]) |
5902 | 5902 |