Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
os = <unloaded module 'os'>
os.system = <built-in function system>
os = <module 'os' from '?'>
mercurial.version = <unloaded module 'version'>
mercurial.version.get_version = <function get_version at 0x?>
mercurial.version = <module 'mercurial.version' from '?'>
mercurial = <module 'mercurial' from '?'>
util = <unloaded module 'util'>
util.system = <function system at 0x?>
util = <module 'mercurial.util' from '?'>
util.system = <function system at 0x?>
fred = <unloaded module 're'>
re = <unloaded module 'sys'>
fred = <unloaded module 're'>
fred.sub = <function sub at 0x?>
fred = <proxied module 're'>
re = <unloaded module 'sys'>
re.stdout = <open file '<stdout>', mode 'w' at 0x?>
re = <proxied module 'sys'>