bzr merge fails if deleted contents differ

[Aaron Bentley]

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

John A Meinel wrote:
> Aaron Bentley wrote:
>> See the previous thread "attn: abentley Re: [BUG] Merging repositories
>> with a directory deleted" for a full discussion of the pitfalls of this
>> conflict type.

> I remember the earlier discussion. But I don't remember having a
> conclusion to it.

Well, you made a suggestion that was similar to the one that started the
discussion, and didn't address the issues raised in that discussion.

> My personal favorite is probably to create some sort of conflict folder,
> where you can put those files, without having to add them to the local
> directory.

Yeah, a conflict directory would have some advantages.  One being that
it's easy to delete all the conflict markers at once.  Another being
that there's no chance of a file already existing where we want to stick
a conflict file.

Sticking foo.THIS foo.OTHER and foo.BASE in the same directory as foo
makes it easier to copare THIS to BASE, OTHER to BASE, etc.

> For deleted stuff, though, I don't really have a problem just deleting
> it. To paraphrase Robert, "Don't comment out, just delete, we do have a
> version control system."

Me too.  But I'm less eager to move code into different files and delete
the original files than he is.

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

iD8DBQFDOwfX0F+nu1YWqI0RAnNmAJ40airPorzF3sQLpLrE5NvDfVY3qACfSkEo
Nf5qkjyI7iXJ1AAwVQBcBuA=
=s9Be
-----END PGP SIGNATURE-----