exception on resolve

Bug #1517234 reported by Codename: Steeve Knight
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Bazaar
New
Undecided
Unassigned
Breezy
Triaged
Medium
Unassigned

Bug Description

hopefully self-explanatory to the learned
- note the resolve never completed

Contents conflict in public_html/acap-dev/modules/CLIENT/config/config.CLIENT.php
1 conflicts encountered.
steeve@steeve-SLTK:/var/www/acapF/acapF-9001/public_html/acap-dev$ bzr resolve modules/CLIENT/config/config.CLIENT.php --take-other
bzr: ERROR: bzrlib.errors.MalformedTransform: Tree transform is malformed [('duplicate', 'new-2', 'new-22', u'config.CLIENT.php')]

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 1121, 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/conflicts.py", line 167, in run
    before, after = resolve(tree, file_list, action=action)
  File "/usr/lib/python2.7/dist-packages/bzrlib/conflicts.py", line 201, in resolve
    conflict._do(action, tree)
  File "/usr/lib/python2.7/dist-packages/bzrlib/conflicts.py", line 431, in _do
    meth(tree)
  File "/usr/lib/python2.7/dist-packages/bzrlib/conflicts.py", line 626, in action_take_other
    self._resolve_with_cleanups(tree, 'THIS')
  File "/usr/lib/python2.7/dist-packages/bzrlib/conflicts.py", line 460, in _resolve_with_cleanups
    op.run_simple(tt, *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/conflicts.py", line 620, in _resolve
    tt.apply()
  File "/usr/lib/python2.7/dist-packages/bzrlib/transform.py", line 1719, in apply
    self._check_malformed()
  File "/usr/lib/python2.7/dist-packages/bzrlib/transform.py", line 555, in _check_malformed
    raise MalformedTransform(conflicts=conflicts)
MalformedTransform: Tree transform is malformed [('duplicate', 'new-2', 'new-22', u'config.CLIENT.php')]

bzr 2.7.0dev1 on python 2.7.8 (Linux-3.16.0-44-generic-x86_64-with-
    Ubuntu-14.10-utopic)
arguments: ['/usr/bin/bzr', 'resolve',
    'modules/CLIENT/config/config.CLIENT.php', '--take-other']
plugins: bash_completion[2.7.0dev1], changelog_merge[2.7.0dev1],
    explorer[1.3.0], grep[2.7.0dev1], launchpad[2.7.0dev1],
    netrc_credential_store[2.7.0dev1], news_merge[2.7.0dev1],
    po_merge[2.7.0dev1], push_and_update[0.2.0dev], qbzr[0.23.1],
    weave_fmt[2.7.0dev1]
encoding: 'utf-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'

*** Bazaar has encountered an internal error. This probably indicates a
    bug in Bazaar. You can help us fix it by filing a bug report at
        https://bugs.launchpad.net/bzr/+filebug
    including this traceback and a description of the problem.

Jelmer Vernooij (jelmer)
tags: added: check-for-breezy
Jelmer Vernooij (jelmer)
tags: added: resolve transform
removed: check-for-breezy
Changed in brz:
status: New → Triaged
importance: Undecided → Critical
importance: Critical → Medium
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers