InconsistentDelta during fast-import

[Adrien Saladin]

Hi,

This bug report is from https://answers.launchpad.net/bzr/+question/98910

I pasted the log below. Please tell me if you need an access to the svn repository.
Thanks.

$ bzr fast-import ptools.fi ptools.bzr -Derror
09:06:47 Collecting statistics ...
09:06:47 Starting import of 255 commits ...
ABORT: exception occurred processing commit @211
bzr: ERROR: bzrlib.errors.InconsistentDelta: An inconsistent delta was supplied involving u'/SConstruct', 'sconstruct-20100129080647-cx5239q3luoyvyxb-3'
reason: New path is not consistent with parent path.

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 842, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1037, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 654, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/adrien/.bazaar/plugins/fastimport/__init__.py", line 384, in run
    params, verbose, user_map=user_map)
  File "/home/adrien/.bazaar/plugins/fastimport/__init__.py", line 111, in _run
    return proc.process(p.iter_commands)
  File "/home/adrien/.bazaar/plugins/fastimport/processor.py", line 95, in process
    self._process(command_iter)
  File "/home/adrien/.bazaar/plugins/fastimport/processors/generic_processor.py", line 280, in _process
    processor.ImportProcessor._process(self, command_iter)
  File "/home/adrien/.bazaar/plugins/fastimport/processor.py", line 117, in _process
    handler(self, cmd)
  File "/home/adrien/.bazaar/plugins/fastimport/processors/generic_processor.py", line 490, in commit_handler
    handler.process()
  File "/home/adrien/.bazaar/plugins/fastimport/processor.py", line 208, in process
    self.post_process_files()
  File "/home/adrien/.bazaar/plugins/fastimport/bzr_commit_handler.py", line 607, in post_process_files
    self._get_inventories)
  File "/home/adrien/.bazaar/plugins/fastimport/revision_store.py", line 401, in load_using_delta
    builder.finish_inventory()
  File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 210, in finish_inventory
    self.parents)
  File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 1067, in add_inventory_by_delta
    basis_inv.apply_delta(delta)
  File "/usr/lib/python2.5/site-packages/bzrlib/inventory.py", line 1193, in apply_delta
    "New path is not consistent with parent path.")
InconsistentDelta: An inconsistent delta was supplied involving u'/SConstruct', 'sconstruct-20100129080647-cx5239q3luoyvyxb-3'
reason: New path is not consistent with parent path.

[Jelmer Vernooij (jelmer)]

Can you attach the problematic fastimport file?

[Martin Pool (mbp)]

There is https://code.launchpad.net/~ian-clatworthy/bzr-fastimport/inconsistent-delta-fixes which sounds like it may address this; it probably need someone else to look at the state of the code and perhaps finish it off. People who are experiencing this bug might like to test it.

[Corey Bryant (corey.bryant)]

I'm getting the same error, and it can be recreated with the following:

bzr branch lp:bzr-fastimport ~/.bazaar/plugins/fastimport
sudo apt-get install python-fastimport

git clone https://github.com/openstack-charmers/charm-swift-proxy github/charm-swift-proxy
mkdir -p bzr/next
cd bzr/next
bzr init
cd -

mkdir tmp
cd github/charm-swift-proxy/
git fast-export master > ../../tmp/swift-proxy.fi
bzr fast-import -v -Derror ../../tmp/swift-proxy.fi bzr/next/
bzr fast-import -v -Derror ../../tmp/swift-proxy.fi /tmp/bzr/next/ # this results in the following exception

I'll take a look at the fix above and see how that works out.

[Corey Bryant (corey.bryant)]

Here's my traceback, it's slightly different: http://paste.ubuntu.com/14695308/

Also I attempted running with the code that Martin mentioned above and it didn't help.