InconsistentDelta during merge-upstream

[Martin Pool]

I'm trying to run merge-upstream into lp:~ubuntu-branches/ubuntu/hardy/bzr/hardy (at <email address hidden>) and it fails like so:

mbp@grace% bzr merge-upstream -r bzr-2.2.0 ../../../bzr.2.2
Using distribution unstable
Using version string 0.0.5+bzr5078 for upstream branch.
Exporting upstream branch revision <email address hidden> to create the tarball
bzr: ERROR: bzrlib.errors.InconsistentDelta: An inconsistent delta was supplied involving u'/.rsyncexclude', 'rsyncexclude-20050408053852-27e0a5928b6829f645beb2e6'
reason: Attempt to add item at path already occupied by id 'rsyncexclude-20091205103605-6tjofjz4i5j16zuv-20'

Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 911, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1111, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 689, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 704, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 135, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/home/mbp/.bazaar/plugins/builddeb/cmds.py", line 658, in run
    merge_type=merge_type, force=force)
  File "/home/mbp/.bazaar/plugins/builddeb/import_dsc.py", line 1519, in merge_upstream
    upstream_revision=upstream_revision)
  File "/home/mbp/.bazaar/plugins/builddeb/import_dsc.py", line 975, in import_upstream
    file_ids_from=upstream_trees + [self_tree])
  File "/home/mbp/.bazaar/plugins/builddeb/bzrtools_import.py", line 197, in import_dir
    import_archive(tree, dir_file, file_ids_from=file_ids_from)
  File "/home/mbp/.bazaar/plugins/builddeb/bzrtools_import.py", line 205, in import_archive
    return _import_archive(tree, archive_file, file_ids_from)
  File "/home/mbp/.bazaar/plugins/builddeb/bzrtools_import.py", line 308, in _import_archive
    tt.apply()
  File "/usr/lib/python2.6/dist-packages/bzrlib/transform.py", line 1570, in apply
    self._tree.apply_inventory_delta(inventory_delta)
  File "/usr/lib/python2.6/dist-packages/bzrlib/mutabletree.py", line 49, in tree_write_locked
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/workingtree_4.py", line 1263, in apply_inventory_delta
    state.update_by_delta(changes)
  File "/usr/lib/python2.6/dist-packages/bzrlib/dirstate.py", line 1355, in update_by_delta
    self._apply_insertions(insertions.values())
  File "/usr/lib/python2.6/dist-packages/bzrlib/dirstate.py", line 1410, in _apply_insertions
    path_utf8=path_utf8)
  File "/usr/lib/python2.6/dist-packages/bzrlib/dirstate.py", line 2746, in update_minimal
    "id %r" % entry[0][2])
InconsistentDelta: An inconsistent delta was supplied involving u'/.rsyncexclude', 'rsyncexclude-20050408053852-27e0a5928b6829f645beb2e6'
reason: Attempt to add item at path already occupied by id 'rsyncexclude-20091205103605-6tjofjz4i5j16zuv-20'
bzr merge-upstream -r bzr-2.2.0 ../../../bzr.2.2 8.36s user 0.71s system 95% cpu 9.455 total

this may well be a bug in bzr core, or it could in some sense be user error (though we don't really want to give a traceback...)

[Martin Pool (mbp)]

What's strange is that I can actually just do a plain bzr merge of 2.2.0 into packaging-hardy.

[James Westby (james-w)]

I bet it is

  http://bazaar.launchpad.net/~bzr-builddeb-hackers/bzr-builddeb/trunk/revision/463

Two reports in 24 hours suggest that this will be common, hence setting to Critical.

Thanks,

James

[Andrew Bennetts (spiv)]

FWIW: merge-upstream from the bzr-2.2.0.tar.gz (from http://edge.launchpad.net/bzr/2.2/2.2.0/+download/bzr-2.2.0.tar.gz) works just fine, as does the merge-upstream with the bzr_2.2.0.orig.tar.gz that "bzr merge-upstream -r bzr-2.2.0 $path_to_bzr_trunk" generates before it fails.

So it's specifically due to dealing with the (unrelated) upstream branch.

[Martin Pool (mbp)]

On 19 August 2010 13:01, Andrew Bennetts <email address hidden> wrote:
> FWIW: merge-upstream from the bzr-2.2.0.tar.gz (from
> http://edge.launchpad.net/bzr/2.2/2.2.0/+download/bzr-2.2.0.tar.gz)
> works just fine, as does the merge-upstream with the
> bzr_2.2.0.orig.tar.gz that "bzr merge-upstream -r bzr-2.2.0
> $path_to_bzr_trunk" generates before it fails.
>
> So it's specifically due to dealing with the (unrelated) upstream
> branch.

Right, that's what I saw too.

--
Martin