lca merges break on git trees

Bug #1826663 reported by Jelmer Vernooij
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Fix Released
Jelmer Vernooij

Bug Description

Traceback (most recent call last):
  File "/usr/lib/python3.7/", line 193, in _run_module_as_main
    "__main__", mod_spec)
  File "/usr/lib/python3.7/", line 85, in _run_code
    exec(code, run_globals)
  File "/home/janitor/debian-janitor/janitor/", line 456, in <module>
  File "/home/janitor/debian-janitor/janitor/", line 423, in main
  File "/home/janitor/debian-janitor/janitor/", line 322, in process_package
    ws.local_tree, provide_context, metadata['subworker'])
  File "/home/janitor/debian-janitor/janitor/", line 182, in make_changes
    tree=local_tree, snapshot=self.args.snapshot)
  File "/home/janitor/debian-janitor/silver-platter/silver_platter/debian/", line 269, in merge_upstream
    upstream_revisions, merge_type=None, force=force)
  File "/home/janitor/.config/breezy/plugins/debian/", line 148, in do_merge
  File "/home/janitor/.config/breezy/plugins/debian/", line 1376, in merge_upstream
    self.pristine_upstream_branch, merge_type=merge_type)
  File "/usr/lib/python3/dist-packages/breezy/", line 695, in merge_from_branch
    conflicts = merger.do_merge()
  File "/usr/lib/python3/dist-packages/breezy/", line 670, in do_merge
    merge = operation.run_simple()
  File "/usr/lib/python3/dist-packages/breezy/", line 137, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python3/dist-packages/breezy/", line 166, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python3/dist-packages/breezy/", line 635, in _do_merge_to
  File "/usr/lib/python3/dist-packages/breezy/", line 773, in do_merge
  File "/usr/lib/python3/dist-packages/breezy/", line 133, in run
    self.cleanups, self.func, self, *args, **kwargs)
  File "/usr/lib/python3/dist-packages/breezy/", line 166, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python3/dist-packages/breezy/", line 778, in _do_merge
  File "/usr/lib/python3/dist-packages/breezy/", line 797, in _compute_transform
    entries = self._entries_lca()
  File "/usr/lib/python3/dist-packages/breezy/", line 909, in _entries_lca
    base_inventory = self.base_tree.root_inventory
AttributeError: 'GitRevisionTree' object has no attribute 'root_inventory'

Tags: git merge janitor

Related branches

Jelmer Vernooij (jelmer)
tags: added: merge
Jelmer Vernooij (jelmer)
Changed in brz:
status: Triaged → Fix Committed
milestone: none → 3.1.0
Jelmer Vernooij (jelmer)
Changed in brz:
status: Fix Committed → Fix Released
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.