view MANIFEST.in @ 146:4a828422247d

Handle merge with deletions

If you merge with a repo that has deleted a file after editing it, hg
attempted to resolve the file. This (correctly) resulted in hg verify
errors because the resolved version didn't show up in the manifests.

This moves the manifest resolution before file resolution and decides
which files to resolve based on the (partially) resolved manifest.
After files are resolved, the final manifest is committed.

include hg
recursive-include mercurial *.py
include tkmerge
include *.txt
include README