bzrlib.errors.DivergedBranches: These branches have diverged when importing

Bug #513277 reported by Robert Collins on 2010-01-27
34
This bug affects 5 people
Affects Status Importance Assigned to Milestone
Ubuntu Distributed Development
High
Unassigned

Bug Description

Looks like LP went down while it was running:
/srv/package-import.canonical.com/new/scripts/python-debian/debian_bundle/changelog.py:274: UserWarning: Invalid key-value pair after ';':
  warnings.warn(message)
Connection to bazaar.launchpad.net closed by remote host.
Traceback (most recent call last):
  File "./import_package.py", line 758, in <module>
    no_existing=options.no_existing))
  File "./import_package.py", line 704, in main
    no_existing=no_existing)
  File "./import_package.py", line 491, in import_package
    use_time_from_changelog=True)
  File "/srv/package-import.canonical.com/new/scripts/plugins/builddeb/import_dsc.py", line 1540, in import_package
    timestamp=timestamp, author=author)
  File "/srv/package-import.canonical.com/new/scripts/plugins/builddeb/import_dsc.py", line 1397, in _do_import_package
    self.pull_version_from_branch(pull_branch, version)
  File "/srv/package-import.canonical.com/new/scripts/plugins/builddeb/import_dsc.py", line 1010, in pull_version_from_branch
    version.upstream_version)
  File "/srv/package-import.canonical.com/new/scripts/plugins/builddeb/import_dsc.py", line 975, in pull_upstream_from_branch
    stop_revision=pull_revision)
  File "<string>", line 4, in pull_write_locked
  File "/usr/lib/python2.5/site-packages/bzrlib/workingtree.py", line 1611, in pull
    local=local)
  File "<string>", line 4, in pull_write_locked
  File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 948, in pull
    possible_transports=possible_transports, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 3194, in pull
    _override_hook_target=_override_hook_target)
  File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 3071, in pull
    overwrite=overwrite, graph=graph)
  File "<string>", line 4, in update_revisions_write_locked
  File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 896, in update_revisions
    overwrite, graph)
  File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 3020, in update_revisions
    stop_revision, last_rev, graph, self.source):
  File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 1382, in _check_if_descendant_or_diverged
    raise errors.DivergedBranches(self, other_branch)
bzrlib.errors.DivergedBranches: These branches have diverged. Use the missing command to see how.
Use the merge command to reconcile them.

See
  - wine
  - sysvinit
http://package-import.ubuntu.com/status/cyrus-sasl2.html
http://package-import.ubuntu.com/status/gimp.html
http://package-import.ubuntu.com/status/kdetoys.html
http://package-import.ubuntu.com/status/konversation.html
http://package-import.ubuntu.com/status/libselinux.html
http://package-import.ubuntu.com/status/mutt.html
http://package-import.ubuntu.com/status/ruby1.8.html
http://package-import.ubuntu.com/status/sysvinit.html

James Westby (james-w) on 2010-04-22
summary: - wine package is stale
+ bzrlib.errors.DivergedBranches: These branches have diverged when
+ importing
description: updated
James Westby (james-w) on 2010-10-02
description: updated
tags: added: import-failure main
James Westby (james-w) on 2010-10-02
description: updated
James Westby (james-w) on 2010-10-02
description: updated
James Westby (james-w) on 2010-10-02
description: updated
James Westby (james-w) on 2010-10-02
description: updated
James Westby (james-w) on 2010-10-02
description: updated
James Westby (james-w) on 2010-10-02
description: updated
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Duplicates of this bug

Other bug subscribers