[MERGE] avoid spurious conflicts

[Aaron Bentley]

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

Hi all,

Bzr is currently producing phantom conflicts when a file is deleted and
replaced with another file with the same name.  A warning would be
printed about moving a file, but no .moved file would be produced.

This patch fixes this.

Branch:
http://code.aaronbentley.com/bzr/bzrrepo/bzr.spurious-conflict/

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

iD8DBQFELMn50F+nu1YWqI0RAmYgAJ9E0/LCx8HIIpx54h4vy+eYLfORKQCaA/M9
tfmfIgXeRQzhFD8oaA2MDLI=
=23GZ
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: spurious-conflict.patch
Type: text/x-patch
Size: 1466 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060331/92cd6f31/attachment.bin