bzr merge fails if deleted contents differ

[Robert Collins]

On Wed, 2005-09-28 at 17:15 -0400, Aaron Bentley wrote:

> > 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.

I'm fairly wary of deleting files unless they are entirely empty - I'll
usually rename them in preference. Unless of course you are thinking of
meta_store.py, which I did delete.

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: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051004/b560ee9b/attachment.pgp