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.

to build a new macosx binary package:

install macpython from http://www.python.org/download/mac

install py2app from http://pythonmac.org/packages/

make sure /usr/local/bin is in your path

run bdist_mpkg in top-level hg directory

find packaged stuff in dist directory