Comment 0 for bug 513277

Revision history for this message
Robert Collins (lifeless) wrote : wine package is stale

Looks like LP went down while it was running:
/srv/ UserWarning: Invalid key-value pair after ';':
Connection to closed by remote host.
Traceback (most recent call last):
  File "./", line 758, in <module>
  File "./", line 704, in main
  File "./", line 491, in import_package
  File "/srv/", line 1540, in import_package
    timestamp=timestamp, author=author)
  File "/srv/", line 1397, in _do_import_package
    self.pull_version_from_branch(pull_branch, version)
  File "/srv/", line 1010, in pull_version_from_branch
  File "/srv/", line 975, in pull_upstream_from_branch
  File "<string>", line 4, in pull_write_locked
  File "/usr/lib/python2.5/site-packages/bzrlib/", line 1611, in pull
  File "<string>", line 4, in pull_write_locked
  File "/usr/lib/python2.5/site-packages/bzrlib/", line 948, in pull
    possible_transports=possible_transports, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/", line 3194, in pull
  File "/usr/lib/python2.5/site-packages/bzrlib/", 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/", line 896, in update_revisions
    overwrite, graph)
  File "/usr/lib/python2.5/site-packages/bzrlib/", line 3020, in update_revisions
    stop_revision, last_rev, graph, self.source):
  File "/usr/lib/python2.5/site-packages/bzrlib/", 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.