Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 23351:1cbc00ff2373
update: remove unnecessary check for unknown files with --check
As far as I and the test suite can tell, the checks in manifestmerge()
already report the errors (whether or not --check is given), so we
don't need to call merge.checkunknown(). Since this is the last call
to the method, also remove the method.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 18 Nov 2014 16:14:32 -0800 |
| parents | 4165cfd67519 |
| children | b913c394386f |
line wrap: on
line diff
--- a/mercurial/commands.py Tue Nov 18 12:29:30 2014 -0600 +++ b/mercurial/commands.py Tue Nov 18 16:14:32 2014 -0800 @@ -6185,7 +6185,6 @@ raise util.Abort(_("uncommitted changes")) if rev is None: rev = repo[repo[None].branch()].rev() - mergemod.checkunknown(repo, repo[None], repo[rev]) repo.ui.setconfig('ui', 'forcemerge', tool, 'update')