Mercurial > hg
view tests/test-demandimport.py.out @ 39576:fa4d16daf1be
context: don't count deleted files as candidates for path conflicts in IMM
This patch makes sure we don't consider the deleted files in our IMM wctx
as potential conflicts while calculating paths conflicts. This fixes the bug
demonstrated in previous patch.
Differential Revision: https://phab.mercurial-scm.org/D4543
author | Pulkit Goyal <pulkit@yandex-team.ru> |
---|---|
date | Wed, 12 Sep 2018 17:45:43 +0300 |
parents | 1d0610fdd63b |
children |
line wrap: on
line source
node = <module 'mercurial.node' from '?'> errorproxy = <unloaded module 'error'> errorproxy.__doc__ = 'Mercurial exceptions. This ...' errorproxy.__name__ = 'mercurial.error' errorproxy.__dict__['__name__'] = 'mercurial.error' errorproxy = <proxied module 'error'> os = <unloaded module 'os'> os.system = <built-in function system> os = <module 'os' from '?'> procutil = <unloaded module 'procutil'> procutil.system = <function system at 0x?> procutil = <module 'mercurial.utils.procutil' from '?'> procutil.system = <function system at 0x?> hgweb = <unloaded module 'hgweb'> hgweb_mod = <unloaded module 'hgweb_mod'> hgweb = <module 'mercurial.hgweb' from '?'> fred = <unloaded module 're'> remod = <unloaded module 're'> re = <unloaded module 'sys'> fred = <unloaded module 're'> fred.sub = <function sub at 0x?> fred = <proxied module 're'> remod = <module 're' from '?'> re = <unloaded module 'sys'> re.stderr = <open file '<whatever>', mode 'w' at 0x?> re = <proxied module 'sys'> contextlib = <unloaded module 'contextlib'> contextlib.unknownattr = ImportError: cannot import name unknownattr __import__('contextlib', ..., ['unknownattr']) = <module 'contextlib' from '?'> hasattr(contextlibimp, 'unknownattr') = False