view tests/test-demandimport.py.out @ 39591:aa022f8873ea

rebase: add tests showing patch conflict detection needs to be smarter in IMM

This patch adds test which shows that you can't rebase a cset which removes a
dir and adds a file of the same as that of dir as there are False positives
path conflicts reported.

I fixed the case when there is a file and we adds a dir of same name while
removing the file, but missed testing the current case. Next patch will fix
this.

Differential Revision: https://phab.mercurial-scm.org/D4544

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