[MERGE] avoid spurious conflicts

[Aaron Bentley]

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

Robert Collins wrote:
|>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]

You're asking what happens when we try to transform "source tree" into
"new tree"?

Nothing bad.  After the first pass, you'll wind up with a transform that
wants to produce two adirs, one versioned, one not.

After we resolve conflicts, we detect conflicts again (up to 10 times).
So in the second pass, we will rename the unversioned adir to adir.moved.

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

iD8DBQFEMEaf0F+nu1YWqI0RApcKAJ9YRbWb7B6dPq/jxfasYcIuo6QsSgCeJW58
dhso4bNJ/XXHb1Md2Vgl/xE=
=NgY2
-----END PGP SIGNATURE-----