| 2010-03-01 05:20:29 |
Martin Pool |
description |
- in folder1, bzr init
- in folder2, bzr branch /folder1
- add somes files in folder2, commit and push in folder1
If I create a new branch, ok, the files is present.
I import a svn repository (bzr svn-import) in folder2 with success. BUT the original files are disappeared...
In folder3, bzr branch /folder1=> ok
In folder3, bzr merge /folder2 => ERROR
bzr: ERROR: zlib.error: Error -3 while decompressing: incorrect data check
*** Bazaar has encountered an internal error. This probably indicates a bug in Bazaar.
Bazaar (bzr) 2.0.2
Python interpreter: /usr/bin/python 2.6.4
Python standard library: /usr/lib/python2.6
Platform: Linux-2.6.31-19-generic-x86_64-with-Ubuntu-9.10-karmic
bzrlib: /usr/lib/python2.6/dist-packages/bzrlib
Bazaar configuration: /home/jfh/.bazaar
Bazaar log file: /home/jfh/.bzr.log |
- in folder1, bzr init
- in folder2, bzr branch /folder1
- add somes files in folder2, commit and push in folder1
If I create a new branch, ok, the files is present.
I import a svn repository (bzr svn-import) in folder2 with success. BUT the original files are disappeared...
In folder3, bzr branch /folder1=> ok
In folder3, bzr merge /folder2 => ERROR
bzr: ERROR: zlib.error: Error -3 while decompressing: incorrect data check
*** Bazaar has encountered an internal error. This probably indicates a bug in Bazaar.
Bazaar (bzr) 2.0.2
Python interpreter: /usr/bin/python 2.6.4
Python standard library: /usr/lib/python2.6
Platform: Linux-2.6.31-19-generic-x86_64-with-Ubuntu-9.10-karmic
bzrlib: /usr/lib/python2.6/dist-packages/bzrlib
Bazaar configuration: /home/jfh/.bazaar
Bazaar log file: /home/jfh/.bzr.log
Traceback (most recent call last):
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 842, in exception_to_return_code
return the_callable(*args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1037, in run_bzr
ret = run(*run_argv)
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 654, in run_argv_aliases
return self.run(**all_cmd_args)
File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 3705, in run
location, revision, remember, possible_transports, pb)
File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 3831, in _get_merger_from_branch
other_revision_id, base_revision_id, other_branch, base_branch)
File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 219, in from_revision_ids
merger.set_other_revision(other, other_branch)
File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 358, in set_other_revision
self._maybe_fetch(other_branch, self.this_branch, self.other_rev_id)
File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 375, in _maybe_fetch
target.fetch(source, revision_id)
File "/usr/lib/python2.6/dist-packages/bzrlib/decorators.py", line 192, in write_locked
result = unbound(self, *args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/branch.py", line 579, in fetch
pb=pb)
File "/usr/lib/python2.6/dist-packages/bzrlib/repository.py", line 1695, in fetch
find_ghosts=find_ghosts, fetch_spec=fetch_spec)
File "/usr/lib/python2.6/dist-packages/bzrlib/decorators.py", line 192, in write_locked
result = unbound(self, *args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/repository.py", line 3413, in fetch
pb=pb, find_ghosts=find_ghosts)
File "/usr/lib/python2.6/dist-packages/bzrlib/fetch.py", line 81, in __init__
self.__fetch()
File "/usr/lib/python2.6/dist-packages/bzrlib/fetch.py", line 107, in __fetch
self._fetch_everything_for_search(search)
File "/usr/lib/python2.6/dist-packages/bzrlib/fetch.py", line 135, in _fetch_everything_for_search
stream, from_format, [])
File "/usr/lib/python2.6/dist-packages/bzrlib/repository.py", line 4238, in insert_stream
return self._locked_insert_stream(stream, src_format, is_resume)
File "/usr/lib/python2.6/dist-packages/bzrlib/repository.py", line 4271, in _locked_insert_stream
self.target_repo.texts.insert_record_stream(substream)
File "/usr/lib/python2.6/dist-packages/bzrlib/groupcompress.py", line 1608, in insert_record_stream
for _ in self._insert_record_stream(stream, random_id=False):
File "/usr/lib/python2.6/dist-packages/bzrlib/groupcompress.py", line 1714, in _insert_record_stream
bytes = record.get_bytes_as('fulltext')
File "/usr/lib/python2.6/dist-packages/bzrlib/groupcompress.py", line 454, in get_bytes_as
self._manager._prepare_for_extract()
File "/usr/lib/python2.6/dist-packages/bzrlib/groupcompress.py", line 554, in _prepare_for_extract
self._block._ensure_content(self._last_byte)
File "/usr/lib/python2.6/dist-packages/bzrlib/groupcompress.py", line 198, in _ensure_content
remaining_decomp, needed_bytes + _ZLIB_DECOMP_WINDOW)
error: Error -3 while decompressing: incorrect data check
|
|
