Fix wrong module reference in copyfile exception

setup.py: reload __version__.py after writing it. write_version loads __version__.py before writing it (see 7eb694a1c1af), so we have to explicitly reload it to use the correct version. Problem diagnosed by Christian Ebert.

fix strip'ping the second parent of a merge

install reposetup hook right after loading the extension

Open bundle files in binary mode

convert-repo: handle packed git tags

lazyindex: handle __delitem__ in loadblock

commit: catch IOError filecommit can still raise IOError if we're on a filesystem without support for symlinks.

Merge with crew-stable

filecommit: don't forget the local parent on a merge with a local rename