[BUG] push to another local location fails if some file in working tree is missed

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Alexander Belchenko wrote:
> The same error raised during update in target branch after failed push.
> To reproduce you need to delete manually some file from target branch,
> and in source branch rename this file to another name.

Okay, I think I see the cause of the bug: contents_conflict is
incorrectly assuming that it should delete the file if it has a file-id,
whether or not the file exists on disk.

I don't expect this will be hard to fix.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFFv2Qd0F+nu1YWqI0RAs7RAJ4w/c1dRJTAmT8nObw4fiy4j+v3jwCbBjiU
lDP7Hgg6DSTGWk9Z6Yrkkr0=
=3MdB
-----END PGP SIGNATURE-----