attn: abentley Re: [BUG] Merging repositories with a directory deleted

[Robert Collins]

On Wed, 2005-09-14 at 13:49 +0200, John Eckerdal wrote:
> 
> bzr: ERROR: The file dir/file1.txt was modified, but does not exist in
> this tree
>   at /usr/lib64/python2.4/site-packages/bzrlib/changeset.py line 1063,
> in missing_for_merge()
>   see ~/.bzr.log for debug information

I encountered exactly this bug during testing of baz2bzr. I haven't
looked closely yet.

Aaron - any chance you can have a peek?
Cheers,
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/20050915/45d53749/attachment.pgp