lca merges break on git trees

Bug #1826663 reported by Jelmer Vernooij on 2019-04-27
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Breezy
Medium
Jelmer Vernooij

Bug Description

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

Related branches

Jelmer Vernooij (jelmer) on 2019-04-27
tags: added: merge
Jelmer Vernooij (jelmer) on 2019-06-02
Changed in brz:
status: Triaged → Fix Committed
milestone: none → 3.1.0
Jelmer Vernooij (jelmer) on 2019-06-08
Changed in brz:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers