| 2010-02-23 15:15:05 |
James Westby |
description |
The sysvinit import is very out of date |
The sysvinit import is very out of date
http://package-import.ubuntu.com/status/sysvinit.html
Traceback (most recent call last):
File "/srv/package-import.canonical.com/new/scripts/import_package.py", line 956, in <module>
no_existing=options.no_existing))
File "/srv/package-import.canonical.com/new/scripts/import_package.py", line 886, in main
import_package(temp_dir, importp, revid_db, bstore, possible_transports=possible_transports)
File "/srv/package-import.canonical.com/new/scripts/import_package.py", line 600, in import_package
use_time_from_changelog=True)
File "/srv/package-import.canonical.com/new/scripts/plugins/builddeb/import_dsc.py", line 1271, in import_package
pull_debian=pull_debian)
File "/srv/package-import.canonical.com/new/scripts/plugins/builddeb/import_dsc.py", line 1132, 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 791, in pull_version_from_branch
version.upstream_version)
File "/srv/package-import.canonical.com/new/scripts/plugins/builddeb/import_dsc.py", line 756, 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 3187, in pull
_override_hook_target=_override_hook_target)
File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 3064, 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 3013, in update_revisions
stop_revision, last_rev, graph, self.source):
File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 1375, 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.
|
|
