Mirror-only local branch of bazaar had conflict on pull

Ian Clatworthy ian.clatworthy at internode.on.net
Mon Jun 30 05:34:00 BST 2008


Tom Tobin wrote:
> My local branch of bazaar's trunk, which I only pull to and branch
> from (i.e., I don't commit to it) had a conflict today when pulling
> from Launchpad:
> 
> Conflict: can't delete bzrlib/tests/interversionedfile_implementations
> because it is not empty.  Not deleting.
> Conflict: can't delete bzrlib/tests/revisionstore_implementations
> because it is not empty.  Not deleting.
> 2 conflicts encountered.
> Now on revision 3513.

I'm pretty sure this is due to some .pyc files remaining in those directories
after the matching .py files were moved/deleted. It is a known issue
and there was a short email thread above the underlying cause recently
on the mailing list. I don't know the bug number sorry.

Ian C.



More information about the bazaar mailing list