With the current tip of mercurial-crew, it's not possible to use "hg addremove" for symlinks, and when a symlink is checked out in a subdirectory of a Mercurial workspace, Mercurial aborts with a "File not found" error. The attached pair of patches fix these two buglets.