[MERGE] avoid spurious conflicts

[Robert Collins]

On Fri, 2006-03-31 at 01:19 -0500, Aaron Bentley wrote:
> -----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.

+1

is there another corner case here?


source tree:
adir/  [id A]
adir/an-unversionedfile

new tree:
adir/  [id B]

?

Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060402/4a2486b7/attachment.pgp