This occurred when running the following commands:
$ bzr branch ubuntu:translate-toolkit
$ cd translate-toolkit
$ bzr merge debianlp:translate-toolkit
Traceback (most recent call last):
File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 930, in exception_to_return_code
return the_callable(*args, **kwargs)
File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1141, in run_bzr
ret = run(*run_argv)
File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 673, in run_argv_aliases
return self.run(**all_cmd_args)
File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 697, in run
return self._operation.run_simple(*args, **kwargs)
File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
self.cleanups, self.func, *args, **kwargs)
File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
result = func(*args, **kwargs)
File "/usr/lib/python2.7/dist-packages/bzrlib/builtins.py", line 4477, in run
verified)
File "/usr/lib/python2.7/dist-packages/bzrlib/builtins.py", line 4496, in _do_merge
conflict_count = merger.do_merge()
File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 686, in do_merge
merge = operation.run_simple()
File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
self.cleanups, self.func, *args, **kwargs)
File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
result = func(*args, **kwargs)
File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 654, in _do_merge_to
merge.do_merge()
File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 802, in do_merge
operation.run()
File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 132, in run
self.cleanups, self.func, self, *args, **kwargs)
File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
result = func(*args, **kwargs)
File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 807, in _do_merge
self._compute_transform()
File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 857, in _compute_transform
self._finish_computing_transform()
File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 867, in _finish_computing_transform
lambda t, c: transform.conflict_pass(t, c, self.other_tree))
File "/usr/lib/python2.7/dist-packages/bzrlib/transform.py", line 3022, in resolve_conflicts
raise MalformedTransform(conflicts=conflicts)
MalformedTransform: Tree transform is malformed [('versioning no contents', 'new-23')]
This occurred when running the following commands: translate- toolkit translate- toolkit
$ bzr branch ubuntu:
$ cd translate-toolkit
$ bzr merge debianlp:
Traceback (most recent call last): python2. 7/dist- packages/ bzrlib/ commands. py", line 930, in exception_ to_return_ code python2. 7/dist- packages/ bzrlib/ commands. py", line 1141, in run_bzr python2. 7/dist- packages/ bzrlib/ commands. py", line 673, in run_argv_aliases **all_cmd_ args) python2. 7/dist- packages/ bzrlib/ commands. py", line 697, in run .run_simple( *args, **kwargs) python2. 7/dist- packages/ bzrlib/ cleanup. py", line 136, in run_simple python2. 7/dist- packages/ bzrlib/ cleanup. py", line 166, in _do_with_cleanups python2. 7/dist- packages/ bzrlib/ builtins. py", line 4477, in run python2. 7/dist- packages/ bzrlib/ builtins. py", line 4496, in _do_merge python2. 7/dist- packages/ bzrlib/ merge.py" , line 686, in do_merge run_simple( ) python2. 7/dist- packages/ bzrlib/ cleanup. py", line 136, in run_simple python2. 7/dist- packages/ bzrlib/ cleanup. py", line 166, in _do_with_cleanups python2. 7/dist- packages/ bzrlib/ merge.py" , line 654, in _do_merge_to do_merge( ) python2. 7/dist- packages/ bzrlib/ merge.py" , line 802, in do_merge python2. 7/dist- packages/ bzrlib/ cleanup. py", line 132, in run python2. 7/dist- packages/ bzrlib/ cleanup. py", line 166, in _do_with_cleanups python2. 7/dist- packages/ bzrlib/ merge.py" , line 807, in _do_merge _compute_ transform( ) python2. 7/dist- packages/ bzrlib/ merge.py" , line 857, in _compute_transform _finish_ computing_ transform( ) python2. 7/dist- packages/ bzrlib/ merge.py" , line 867, in _finish_ computing_ transform conflict_ pass(t, c, self.other_tree)) python2. 7/dist- packages/ bzrlib/ transform. py", line 3022, in resolve_conflicts orm(conflicts= conflicts)
File "/usr/lib/
return the_callable(*args, **kwargs)
File "/usr/lib/
ret = run(*run_argv)
File "/usr/lib/
return self.run(
File "/usr/lib/
return self._operation
File "/usr/lib/
self.cleanups, self.func, *args, **kwargs)
File "/usr/lib/
result = func(*args, **kwargs)
File "/usr/lib/
verified)
File "/usr/lib/
conflict_count = merger.do_merge()
File "/usr/lib/
merge = operation.
File "/usr/lib/
self.cleanups, self.func, *args, **kwargs)
File "/usr/lib/
result = func(*args, **kwargs)
File "/usr/lib/
merge.
File "/usr/lib/
operation.run()
File "/usr/lib/
self.cleanups, self.func, self, *args, **kwargs)
File "/usr/lib/
result = func(*args, **kwargs)
File "/usr/lib/
self.
File "/usr/lib/
self.
File "/usr/lib/
lambda t, c: transform.
File "/usr/lib/
raise MalformedTransf
MalformedTransform: Tree transform is malformed [('versioning no contents', 'new-23')]
bzr 2.6b2 on python 2.7.3 (Linux- 3.7.0-2- generic- x86_64- with- 13.04-raring) translate- toolkit' ] [2.6b2] , builddeb[2.7.0dev], changelog_ merge[2. 6b2], l_store[ 2.6b2], merge[2. 6b2], po_merge[2.6b2], qbzr[0.23.0], search[1.7.0dev], fmt[2.6b2]
Ubuntu-
arguments: ['/usr/bin/bzr', 'merge', 'debianlp:
plugins: bash_completion
git[0.6.9], launchpad[2.6b2], netrc_credentia
news_
weave_
encoding: 'utf-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'