launchpad-dev team mailing list archive

[Jonathan Lange <jml@xxxxxxxxxxxxx>]

On Thu, Feb 3, 2011 at 3:37 PM, Curtis Hovey <curtis.hovey@xxxxxxxxxxxxx> wrote:
> I saw conflicts from a branch I landed when I pulled db-devel:
>        Conflict: can't delete lib/canonical/widgets.moved because it is not empty.  Not deleting.
>        Conflict adding file lib/canonical/widgets.  Moved existing file to lib/canonical/widgets.moved.
>        Conflict: can't delete lib/canonical/widgets.moved/tests because it is not empty.  Not deleting.
>        3 conflicts encountered.
>
> I do not know why ec2, pqm, and buildbot had no issues landing my branch. I resolved
> my local issues by deleting the moved directories.
>
>        $ rm -r lib/canonical/widgets.moved
>        $ bzr resolve lib/canonical/widgets.moved lib/canonical/widgets lib/canonical/widgets.moved/tests
>

This is a long-standing cluster of issues with Bazaar:
  https://bugs.launchpad.net/bzr/+bug/344013
  https://bugs.launchpad.net/bzr/+bug/323111

When you are merging something that deletes a directory, and that
directory has non-versioned files, Bazaar plays it safe, keeps the
directory and flags a conflict.

The reason PQM etc don't have the problem is that they do merges while
there are no build artifacts present in the tree.

jml