Using Ubuntu gutsy. I upgraded this morning to bzr 1.3. Have made
several commits to my local/remote dev branch. When I tried to merge
from a co-worker's branch (who upgraded to 1.3 late yesterday and
committed with 1.3 the branch I am trying to merge from) I received a
similar error shown below. I am trying to check with him to see what
changes he may have made in the file that has the error....
[EMAIL PROTECTED]:~/programming/antespam/dev$ bzr merge bzr+ssh://[EMAIL
PROTECTED]/var/arch/cdorman/antespam/development/
bzr: ERROR: exceptions.ValueError: invalid literal for int() with base 10:
'package FanMail::Controller::Signup;\n'
Traceback (most recent call last):
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 834, in
run_bzr_catch_errors
return run_bzr(argv)
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 790, in
run_bzr
ret = run(*run_argv)
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 492, in
run_argv_aliases
return self.run(**all_cmd_args)
File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 2872, in run
location, revision, remember, possible_transports, pb)
File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 2978, in
_get_merger_from_branch
other_revision_id, base_revision_id, other_branch, base_branch)
File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 187, in
from_revision_ids
merger.set_other_revision(other, other_branch)
File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 329, in
set_other_revision
self._maybe_fetch(other_branch, self.this_branch, self.other_rev_id)
File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 346, in
_maybe_fetch
target.fetch(source, revision_id)
File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 165, in
write_locked
return unbound(self, *args, **kwargs)
File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 266, in fetch
pb=nested_pb)
File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 949, in
fetch
return inter.fetch(revision_id=revision_id, pb=pb, find_ghosts=find_ghosts)
File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 165, in
write_locked
return unbound(self, *args, **kwargs)
File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 2963, in
fetch
pb=pb, find_ghosts=find_ghosts)
File "/usr/lib/python2.5/site-packages/bzrlib/fetch.py", line 109, in __init__
self.__fetch()
File "/usr/lib/python2.5/site-packages/bzrlib/fetch.py", line 139, in __fetch
self._fetch_everything_for_search(search, pp)
File "/usr/lib/python2.5/site-packages/bzrlib/fetch.py", line 418, in
_fetch_everything_for_search
self.to_repository.insert_data_stream(data_stream)
File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 860, in
insert_data_stream
(format, data_list, reader_func))
File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 803, in
insert_data_stream
self.join(source)
File "/usr/lib/python2.5/site-packages/bzrlib/versionedfile.py", line 421, in
join
ignore_missing)
File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 2704, in join
return self._copy_texts(pb, msg, version_ids, ignore_missing)
File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 2683, in
_copy_texts
self.source.get_lines(version),
File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 1099, in
get_lines
return self.get_line_list([version_id])[0]
File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 1138, in
get_line_list
text_map, content_map = self._get_content_maps(version_ids)
File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 1179, in
_get_content_maps
copy_base_content=multiple_versions)
File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 308, in
parse_record
delta = self.parse_line_delta(record, version_id)
File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 456, in
parse_line_delta
return list(self.parse_line_delta_iter(lines, version_id))
File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 451, in
parse_line_delta_iter
start, end, c = [int(n) for n in header.split(',')]
ValueError: invalid literal for int() with base 10: 'package
FanMail::Controller::Signup;\n'
bzr 1.3 on python 2.5.1.final.0 (linux2)
arguments: ['/usr/bin/bzr', 'merge', 'bzr+ssh://[EMAIL
PROTECTED]/var/arch/cdorman/antespam/development/']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'
plugins:
bzrtools /usr/lib/python2.5/site-packages/bzrlib/plugins/bzrtools
[1.3.0]
email /home/adorman/.bazaar/plugins/email [unknown]
launchpad
/usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [unknown]
*** Bazaar has encountered an internal error.
--
ValueError when trying to pull/merge from a remote repository
https://bugs.launchpad.net/bugs/208418
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
--
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
