Conflicts in removed files

[Aaron Bentley]

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

Algis Kabaila wrote:
> On Saturday 12 December 2009 16:41:22 Stephen J. Turnbull wrote:
>> As pointed out by David and IIRC Stefan, the conflicts are *not*
>> spurious.  
> No, they are not.  They are persistent, OK?

When we say that conflicts are "spurious", we mean that they are
unjustified or ill-founded.  "persistent" isn't the opposite of
spurious.  The opposite of spurious is "real" or "valid".

Two changes have been made to a file that cannot be reconciled.  One is
deletion, one is modification.  In general, there is no reason for bzr
to prefer one operation over the other, because there are cases where
the modification is a valuable change.  Stefan noted this in his initial
email:

> I understand that these are real conflicts and that depending on the
> reason why I removed those files, I may very much want to know about
> those conflicts so I can merge the changes into some other place (for
> example), say if I removed "foo.c" because I reimplemented the
> functionality from scratch in some other file.

None of this means that we can't solve Stefan's issue to his
satisfaction.  It just means that bzr should generate conflicts
unless/until the user indicates a better way to handle them.

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

iEYEARECAAYFAksnPFcACgkQ0F+nu1YWqI0BZwCdEZcr/g8eS0R5BHvzdBwkKErD
Yc4An1CEcxVUgaSI+UKVH3D0lTizAD/L
=5Xa4
-----END PGP SIGNATURE-----