merge aborts with Tree transform is malformed [('unversioned executability', 'new-1')]

Bug #430129 reported by Vincent Ladeuil
This bug affects 3 people
Affects Status Importance Assigned to Milestone
Jelmer Vernooij

Bug Description

class TestResolveConflicts(script.TestCaseWithTransportAndScript):

    preamble = None # The setup script set by daughter classes

    def setUp(self):
        super(TestResolveConflicts, self).setUp()

class TestResolveNonDirectoryParent(TestResolveConflicts):

    preamble = """
bzr init trunk
cd trunk
bzr mkdir foo
bzr commit -m 'Create trunk'
rm -r foo
echo "Boo!" >foo
bzr commit -m 'foo is now a file'

bzr branch . -r 1 ../branch
cd ../branch
echo "Boing" >foo/bar
bzr add foo/bar
bzr commit -m 'Add foo/bar'

bzr merge ../trunk

aborts. It shouldn't.

Revision history for this message
Vincent Ladeuil (vila) wrote :

I haven't looked closely since the test is not exactly the one I wanted to write.

Changed in bzr:
status: New → Confirmed
importance: Undecided → Medium
tags: added: conflicts
Revision history for this message
Martin Pool (mbp) wrote :

I think I hit this again:

mbp@grace% bzr import-upstream 2.1.0 ../Packaging/bzr-2.1.0.tar.gz ../bzr-2.1.0
bzr: ERROR: bzrlib.errors.MalformedTransform: Tree transform is malformed [('unversioned executability', 'new-896'), ('unversioned executability', 'new-684')]

Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/bzrlib/", line 853, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/", line 1055, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.6/dist-packages/bzrlib/", line 661, in run_argv_aliases
    return self.run_direct(**all_cmd_args)
  File "/usr/lib/python2.6/dist-packages/bzrlib/", line 665, in run_direct
    return self._operation.run_simple(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/", line 122, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/", line 156, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/home/mbp/.bazaar/plugins/builddeb/", line 861, in run
    upstream_branch=upstream, upstream_revision=upstream_revid)
  File "/home/mbp/.bazaar/plugins/builddeb/", line 1022, in import_upstream_tarball
  File "/home/mbp/.bazaar/plugins/builddeb/", line 975, in import_upstream
    file_ids_from=upstream_trees + [self_tree])
  File "/home/mbp/.bazaar/plugins/builddeb/", line 197, in import_dir
    import_archive(tree, dir_file, file_ids_from=file_ids_from)
  File "/home/mbp/.bazaar/plugins/builddeb/", line 295, in import_archive
    for conflict in cook_conflicts(resolve_conflicts(tt), tt):
  File "/usr/lib/python2.6/dist-packages/bzrlib/", line 2769, in resolve_conflicts
    raise MalformedTransform(conflicts=conflicts)
MalformedTransform: Tree transform is malformed [('unversioned executability', 'new-896'), ('unversioned executability', 'new-684')]
bzr import-upstream 2.1.0 ../Packaging/bzr-2.1.0.tar.gz ../bzr-2.1.0 3.20s user 0.62s system 89% cpu 4.257 total

Jelmer Vernooij (jelmer)
tags: added: check-for-breezy
Jelmer Vernooij (jelmer)
tags: removed: check-for-breezy
Jelmer Vernooij (jelmer)
Changed in brz:
status: New → Triaged
importance: Undecided → Critical
assignee: nobody → Jelmer Vernooij (jelmer)
milestone: none → 3.3.1
tags: added: debian-janitor
Jelmer Vernooij (jelmer)
Changed in brz:
milestone: 3.3.1 → 3.3.2
Jelmer Vernooij (jelmer)
Changed in brz:
milestone: 3.3.2 → 3.3.3
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.