Bzr-fastimport: graceful handling of faulty revisions

[David Reitter]

Second attempt to send a merge bundle, this time the correct file.   
Apologies for the noise.



---
This fixes bug #348038 as well as the related error below (if faulty  
revisions are detected, we need to ignore them in  
self._get_filecommands).

I'm just attaching the merge bundle here - let's see if that works,  
since it's my first one.
PS.: second

bzr: ERROR: exceptions.AttributeError: 'NoneType' object has no  
attribute 'changes_from'

Traceback (most recent call last):
  File "/Library/Python/2.5/site-packages/bzrlib/commands.py", line  
716, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/Library/Python/2.5/site-packages/bzrlib/commands.py", line  
911, in run_bzr
    ret = run(*run_argv)
  File "/Library/Python/2.5/site-packages/bzrlib/commands.py", line  
547, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/Users/dr/.bazaar/plugins/fastimport/__init__.py", line 408,  
in run
    return exporter.run()
  File "/Users/dr/.bazaar/plugins/fastimport/bzr_exporter.py", line  
69, in run
    self.emit_commit(revid, self.git_branch)
  File "/Users/dr/.bazaar/plugins/fastimport/bzr_exporter.py", line  
152, in emit_commit
    file_cmds = self._get_filecommands(parent, revid)
  File "/Users/dr/.bazaar/plugins/fastimport/bzr_exporter.py", line  
204, in _get_filecommands
    changes = tree_new.changes_from(tree_old)
AttributeError: 'NoneType' object has no attribute 'changes_from'



-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-fastimport-malformed-revisions.diff
Type: application/octet-stream
Size: 8833 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090324/1c10fcd2/attachment.obj