Comment 1 for bug 385667

An additional glitch needs fixing. The following error occurs when calling "bzr merge-upstream" in an empty branch.

{{{
Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 835, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1030, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 647, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/mhr/.bazaar/plugins/builddeb/cmds.py", line 617, in run
    merge_type=merge_type)
  File "/home/mhr/.bazaar/plugins/builddeb/import_dsc.py", line 1617, in merge_upstream
    previous_upstream_revision = get_snapshot_revision(previous_version.upstream_version)
AttributeError: 'NoneType' object has no attribute 'upstream_version'
}}}