Mercurial > hg
diff mercurial/demandimport.py @ 28286:c7f89ad87bae
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 29 Feb 2016 17:52:17 -0600 |
parents | 9ff7261cc0f5 f5b2b358b8b7 |
children | fcaf20175b1b |
line wrap: on
line diff
--- a/mercurial/demandimport.py Sat Feb 27 21:29:42 2016 -0800 +++ b/mercurial/demandimport.py Mon Feb 29 17:52:17 2016 -0600 @@ -235,6 +235,8 @@ ignore = [ '__future__', '_hashlib', + # ImportError during pkg_resources/__init__.py:fixup_namespace_package + '_imp', '_xmlplus', 'fcntl', 'win32com.gen_py',