"unknown kind" assertion on merge

[Parth Malwankar]

Hello,

While doing a merge I faced the following assertion on ubuntu 9.04, bzr ppa 1.16.1

{~/cz.repo/acpstable}
(17:15:%) bzr merge ../acpunstable
bzr: ERROR: exceptions.AssertionError: Unknown kind 'relocated'

Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 729, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 924, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 560, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 3596, in run
    verified)
  File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 3614, in _do_merge
    conflict_count = merger.do_merge()
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 495, in do_merge
    self._do_merge_to(merge)
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 467, in _do_merge_to
    merge.do_merge()
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 606, in do_merge
    self._compute_transform()
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 649, in _compute_transform
    file_status = self.merge_contents(file_id)
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 1151, in merge_contents
    self.other_tree, file_id)
  File "/usr/lib/python2.6/dist-packages/bzrlib/transform.py", line 2344, in create_from_tree
    raise AssertionError('Unknown kind %r' % kind)
AssertionError: Unknown kind 'relocated'

bzr 1.16.1 on python 2.6.2 (linux2)
arguments: ['/usr/bin/bzr', 'merge', '../acpunstable']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_IN'
plugins:
  bisect /home/apurva/.bazaar/plugins/bisect [1.1.0.pre.0]
  bzrtools /usr/lib/python2.6/dist-packages/bzrlib/plugins/bzrtools [1.16]
  email /usr/lib/python2.6/dist-packages/bzrlib/plugins/email [unknown]
  launchpad /usr/lib/python2.6/dist-packages/bzrlib/plugins/launchpad [1.16.1]
  netrc_credential_store /usr/lib/python2.6/dist-packages/bzrlib/plugins/netrc_credential_store [1.16.1]
  search /usr/lib/python2.6/dist-packages/bzrlib/plugins/search [1.7dev]
  touch /home/apurva/.bazaar/plugins/touch [unknown]
  upload /usr/lib/python2.6/dist-packages/bzrlib/plugins/upload [0.1]
*** Bazaar has encountered an internal error.
    Please report a bug at https://bugs.launchpad.net/bzr/+filebug
    including this traceback, and a description of what you
    were doing when the error occurred.

{~/cz.repo/acpstable}
(17:26:%) bzr info
Standalone tree (format: 1.9-rich-root)
Location:
  branch root: .

Related branches:
    push branch: sftp://<email address hidden>/home/user0/repo/acpstable/
  parent branch: sftp://<email address hidden>/home/user0/repo/acpstable/
  submit branch: /home/apurva/cz.repo/acptest

I see this failure consistently after this during a merge.
Below is are the contents of .bzr.log:

Mon 2009-07-06 17:04:45 +0530
0.041 bzr arguments: [u'revert', u'.']
0.059 looking for plugins in /home/apurva/.bazaar/plugins
0.152 looking for plugins in /usr/lib/python2.6/dist-packages/bzrlib/plugins
0.188 encoding stdout as sys.stdout encoding 'UTF-8'
0.220 opening working tree '/home/apurva/cz.repo/acpstable'
0.455 return code 0

Mon 2009-07-06 17:14:21 +0530
0.053 bzr arguments: [u'merge', u'../acpunstable']
0.088 looking for plugins in /home/apurva/.bazaar/plugins
0.176 looking for plugins in /usr/lib/python2.6/dist-packages/bzrlib/plugins
0.249 opening working tree '/home/apurva/cz.repo/acpstable'
0.288 Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 729, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 924, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 560, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 3531, in run
    raise errors.UncommittedChanges(tree)
UncommittedChanges: Working tree "/home/apurva/cz.repo/acpstable/" has uncommitted changes.

0.289 return code 3

Mon 2009-07-06 17:14:25 +0530
0.029 bzr arguments: [u'st']
0.048 looking for plugins in /home/apurva/.bazaar/plugins
0.135 looking for plugins in /usr/lib/python2.6/dist-packages/bzrlib/plugins
0.172 encoding stdout as sys.stdout encoding 'UTF-8'
0.204 opening working tree '/home/apurva/cz.repo/acpstable'
0.210 check paths: None
0.272 return code 0

Mon 2009-07-06 17:14:44 +0530
0.043 bzr arguments: [u'revert', u'.']
0.061 looking for plugins in /home/apurva/.bazaar/plugins
0.150 looking for plugins in /usr/lib/python2.6/dist-packages/bzrlib/plugins
0.187 encoding stdout as sys.stdout encoding 'UTF-8'
0.219 opening working tree '/home/apurva/cz.repo/acpstable'
[14046] 2009-07-06 17:14:44.726 INFO: M arden/app_config.py
[14046] 2009-07-06 17:14:44.730 INFO: M arden/settings.py
0.356 return code 0

Mon 2009-07-06 17:15:01 +0530
0.046 bzr arguments: [u'merge', u'../acpunstable']
0.064 looking for plugins in /home/apurva/.bazaar/plugins
0.152 looking for plugins in /usr/lib/python2.6/dist-packages/bzrlib/plugins
0.225 opening working tree '/home/apurva/cz.repo/acpstable'
0.285 Base revid: '<email address hidden>'
[14050] 2009-07-06 17:15:01.401 INFO: Nothing to do.
0.291 return code 0

Mon 2009-07-06 17:15:12 +0530
0.030 bzr arguments: [u'merge', u'../acpunstable']
0.049 looking for plugins in /home/apurva/.bazaar/plugins
0.138 looking for plugins in /usr/lib/python2.6/dist-packages/bzrlib/plugins
0.211 opening working tree '/home/apurva/cz.repo/acpstable'
0.528 Base revid: '<email address hidden>'
0.697 Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 729, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 924, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 560, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 3596, in run
    verified)
  File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 3614, in _do_merge
    conflict_count = merger.do_merge()
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 495, in do_merge
    self._do_merge_to(merge)
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 467, in _do_merge_to
    merge.do_merge()
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 606, in do_merge
    self._compute_transform()
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 649, in _compute_transform
    file_status = self.merge_contents(file_id)
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 1151, in merge_contents
    self.other_tree, file_id)
  File "/usr/lib/python2.6/dist-packages/bzrlib/transform.py", line 2344, in create_from_tree
    raise AssertionError('Unknown kind %r' % kind)
AssertionError: Unknown kind 'relocated'

0.730 Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/bzrlib/plugin.py", line 407, in _get__version__
    version_string = _format_version_tuple(version_info)
  File "/usr/lib/python2.6/dist-packages/bzrlib/lazy_import.py", line 125, in __call__
    return obj(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/__init__.py", line 102, in _format_version_tuple
    raise ValueError("version_info %r not valid" % (version_info,))
ValueError: version_info (1, 1, 0, 'pre', 0) not valid

0.730 return code 4

[James Westby (james-w)]

Hi,

This looks like a duplicate of bug 338516, can someone confirm?

Thanks,

James

[Pekka Jääskeläinen (pekka-jaaskelainen)]

Happened to me.