bzr remove problem

[Andrew Bennetts]

On Thu, Nov 23, 2006 at 08:52:16PM +0100, Alex Greif wrote:
> Hi,
> here is what I did with v0.9 of bazaar:
> 1. on a branch I removed a folder (_statistik) with its subfolders and files
> 2. committed
> 3. pushed the changes to another branch
> 
> on the other branch I get conflicts like:
> conflicts:
>  Conflict adding files to mod_python-3.2.8/scripts/_statistik.  Not 
>  deleting.
>  Conflict adding files to mod_python-3.2.8/scripts/_statistik/model.
> Not deleting.
>  Conflict adding files to mod_python-3.2.8/scripts/_statistik/test.
> Not deleting.
> 
> How can I resolve the conflicts?

This is probably because your working tree had .pyc files or similar in those
directories.  bzr is noticing that you have unversioned files in directories
that it wants to remove, so it's refusing to remove them and reporting it as a
conflict.  With more recent bzr, the message has been improved to say "Conflict:
can't delete some/directory because it is not empty.  Not deleting." which is
less confusing.

To resolve the conflict, you need to say "bzr resolved
mod_python-3.2.8/scripts/_statistik", and so on, for each directory that could
not be removed.  "bzr conflicts" at any time will report the list of outstanding
conflicts.  If you're confident you've resolved everything, you can just use "bzr
resolved --all" instead of invoking "bzr resolved" for each individual conflict.

-Andrew.