funkiness when updating bzrtools

[John A Meinel]

Robert Collins wrote:
> I've seen this a few times when updating by bzrtools branches:
> 
> bzr: WARNING: Conflict adding file errors.py.  Moved existing file to
> errors.py.moved.                                                                                                                            
> 
> 
> After this, errors.py.moved does not exist on disk. This only occurs
> when I transit past the revision where errors.py changed file-id.
> 
> Cheers,
> Rob

I've seen it as well. I've also seen it when merging bzr.dev (if you go
far enough back).

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060524/977afef2/attachment.pgp