The attempt to merge lp:~jelmer/brz/git-no-file-id into lp:brz/3.3 failed. Command exited with 1. Below is the output from the failed tests. Collecting setuptools-gettext Downloading setuptools_gettext-0.1.1-py3-none-any.whl (10 kB) Requirement already satisfied: setuptools>=46.1 in ./lib/python3.10/site-packages (from setuptools-gettext) (65.5.0) Installing collected packages: setuptools-gettext Successfully installed setuptools-gettext-0.1.1 Obtaining file:///tmp/tarmac/branch.xxlbrgzh Installing build dependencies: started Installing build dependencies: finished with status 'done' Checking if build backend supports build_editable: started Checking if build backend supports build_editable: finished with status 'done' Getting requirements to build editable: started Getting requirements to build editable: finished with status 'done' Preparing editable metadata (pyproject.toml): started Preparing editable metadata (pyproject.toml): finished with status 'done' Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.0.6) Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.4.1) Requirement already satisfied: dulwich>=0.20.46 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.20.46) Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.8) Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.2.3) Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.26.12) Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.12) Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.10.17) Collecting fastimport Downloading fastimport-0.9.14.tar.gz (41 kB) ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 41.8/41.8 kB 44.5 kB/s eta 0:00:00 Preparing metadata (setup.py): started Preparing metadata (setup.py): finished with status 'done' Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.18.0) Requirement already satisfied: paramiko in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (2.10.4) Collecting sphinx-epytext Downloading sphinx-epytext-0.0.4.tar.gz (3.6 kB) Preparing metadata (setup.py): started Preparing metadata (setup.py): finished with status 'done' Requirement already satisfied: setuptools in ./lib/python3.10/site-packages (from breezy==3.3.1.dev0) (65.5.0) Collecting sphinx Downloading sphinx-5.3.0-py3-none-any.whl (3.2 MB) ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 3.2/3.2 MB 8.2 MB/s eta 0:00:00 Collecting testtools Downloading testtools-2.5.0-py3-none-any.whl (181 kB) ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 182.0/182.0 kB 1.7 MB/s eta 0:00:00 Collecting python-subunit Downloading python_subunit-1.4.0-py2.py3-none-any.whl (106 kB) ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 106.1/106.1 kB 779.8 kB/s eta 0:00:00 Requirement already satisfied: httplib2 in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.1.dev0) (0.20.4) Collecting keyring Downloading keyring-23.9.3-py3-none-any.whl (35 kB) Requirement already satisfied: lazr.restfulclient>=0.9.19 in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.1.dev0) (0.14.5) Requirement already satisfied: lazr.uri in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.1.dev0) (1.0.6) Requirement already satisfied: six in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.1.dev0) (1.16.0) Collecting extras Downloading extras-1.0.0-py2.py3-none-any.whl (7.3 kB) Collecting fixtures>=1.3.0 Downloading fixtures-4.0.1.tar.gz (56 kB) ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 56.8/56.8 kB 302.7 kB/s eta 0:00:00 Installing build dependencies: started Installing build dependencies: finished with status 'done' Getting requirements to build wheel: started Getting requirements to build wheel: finished with status 'done' Preparing metadata (pyproject.toml): started Preparing metadata (pyproject.toml): finished with status 'done' Collecting pbr>=0.11 Using cached pbr-5.11.0-py2.py3-none-any.whl (112 kB) Collecting snowballstemmer>=2.0 Downloading snowballstemmer-2.2.0-py2.py3-none-any.whl (93 kB) ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 93.0/93.0 kB 755.1 kB/s eta 0:00:00 Collecting sphinxcontrib-applehelp Downloading sphinxcontrib_applehelp-1.0.2-py2.py3-none-any.whl (121 kB) ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 121.2/121.2 kB 969.7 kB/s eta 0:00:00 Collecting sphinxcontrib-devhelp Downloading sphinxcontrib_devhelp-1.0.2-py2.py3-none-any.whl (84 kB) ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 84.7/84.7 kB 664.7 kB/s eta 0:00:00 Collecting imagesize>=1.3 Downloading imagesize-1.4.1-py2.py3-none-any.whl (8.8 kB) Collecting requests>=2.5.0 Downloading requests-2.28.1-py3-none-any.whl (62 kB) ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 62.8/62.8 kB 835.3 kB/s eta 0:00:00 Collecting babel>=2.9 Downloading Babel-2.10.3-py3-none-any.whl (9.5 MB) ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 9.5/9.5 MB 11.3 MB/s eta 0:00:00 Collecting alabaster<0.8,>=0.7 Downloading alabaster-0.7.12-py2.py3-none-any.whl (14 kB) Collecting sphinxcontrib-qthelp Downloading sphinxcontrib_qthelp-1.0.3-py2.py3-none-any.whl (90 kB) ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 90.6/90.6 kB 915.6 kB/s eta 0:00:00 Collecting sphinxcontrib-htmlhelp>=2.0.0 Downloading sphinxcontrib_htmlhelp-2.0.0-py2.py3-none-any.whl (100 kB) ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 100.5/100.5 kB 1.1 MB/s eta 0:00:00 Collecting sphinxcontrib-jsmath Downloading sphinxcontrib_jsmath-1.0.1-py2.py3-none-any.whl (5.1 kB) Collecting Jinja2>=3.0 Downloading Jinja2-3.1.2-py3-none-any.whl (133 kB) ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 133.1/133.1 kB 1.2 MB/s eta 0:00:00 Requirement already satisfied: Pygments>=2.12 in /usr/lib/python3/dist-packages (from sphinx->breezy==3.3.1.dev0) (2.12.0) Collecting sphinxcontrib-serializinghtml>=1.1.5 Downloading sphinxcontrib_serializinghtml-1.1.5-py2.py3-none-any.whl (94 kB) ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 94.0/94.0 kB 760.7 kB/s eta 0:00:00 Collecting docutils<0.20,>=0.14 Downloading docutils-0.19-py3-none-any.whl (570 kB) ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 570.5/570.5 kB 3.8 MB/s eta 0:00:00 Collecting packaging>=21.0 ... OUTPUT TRIMMED ... File "/tmp/tarmac/branch.xxlbrgzh/breezy/merge.py", line 672, in do_merge merge = self._do_merge_to() File "/tmp/tarmac/branch.xxlbrgzh/breezy/merge.py", line 635, in _do_merge_to merge.do_merge() File "/tmp/tarmac/branch.xxlbrgzh/breezy/merge.py", line 776, in do_merge self._compute_transform() File "/tmp/tarmac/branch.xxlbrgzh/breezy/merge.py", line 792, in _compute_transform entries = list(self._entries3()) File "/tmp/tarmac/branch.xxlbrgzh/breezy/merge.py", line 871, in _entries3 this_parent = this_entry.parent_id AttributeError: 'GitTreeDirectory' object has no attribute 'parent_id' ====================================================================== ERROR: breezy.tests.per_workingtree.test_workingtree.TestWorkingTreeUpdate.test_update_revision(GitWorkingTreeFormat) ---------------------------------------------------------------------- testtools.testresult.real._StringException: log: {{{ 1630.639 preparing to commit 1630.640 Selecting files for commit with filter None 1630.642 preparing to commit 1630.644 Selecting files for commit with filter None 1630.648 preparing to commit 1630.649 Selecting files for commit with filter None 1630.655 preparing to commit 1630.656 Selecting files for commit with filter None 1630.659 preparing to commit 1630.660 Selecting files for commit with filter None 1630.665 git: counting objects: 1 1630.666 git: counting objects: 2 1630.666 git: counting objects: 3 1630.666 git: counting objects: 4 1630.666 git: counting objects: 5 1630.666 git: counting objects: 6 1630.666 git: counting objects: 7 1630.666 git: writing pack data: 0/7 1630.666 git: writing pack data: 1/7 1630.666 git: writing pack data: 2/7 1630.666 git: writing pack data: 3/7 1630.667 git: writing pack data: 4/7 1630.667 git: writing pack data: 5/7 1630.667 git: writing pack data: 6/7 1630.676 git: counting objects: 1 1630.676 git: counting objects: 2 1630.677 git: counting objects: 3 1630.677 git: counting objects: 4 1630.677 git: counting objects: 5 1630.677 git: counting objects: 6 1630.677 git: writing pack data: 0/6 1630.677 git: writing pack data: 1/6 1630.677 git: writing pack data: 2/6 1630.677 git: writing pack data: 3/6 1630.677 git: writing pack data: 4/6 1630.677 git: writing pack data: 5/6 }}} Traceback (most recent call last): File "/tmp/tarmac/branch.xxlbrgzh/breezy/tests/per_workingtree/test_workingtree.py", line 1228, in test_update_revision wt, master = self.make_checkout_and_master( File "/tmp/tarmac/branch.xxlbrgzh/breezy/tests/per_workingtree/test_workingtree.py", line 1183, in make_checkout_and_master wt.pull(final_branch, stop_revision=wt_revid) File "/tmp/tarmac/branch.xxlbrgzh/breezy/git/workingtree.py", line 1276, in pull self._update_git_tree( File "/tmp/tarmac/branch.xxlbrgzh/breezy/git/workingtree.py", line 1260, in _update_git_tree merge_inner( File "/tmp/tarmac/branch.xxlbrgzh/breezy/merge.py", line 1867, in merge_inner return merger.do_merge() File "/tmp/tarmac/branch.xxlbrgzh/breezy/merge.py", line 672, in do_merge merge = self._do_merge_to() File "/tmp/tarmac/branch.xxlbrgzh/breezy/merge.py", line 635, in _do_merge_to merge.do_merge() File "/tmp/tarmac/branch.xxlbrgzh/breezy/merge.py", line 776, in do_merge self._compute_transform() File "/tmp/tarmac/branch.xxlbrgzh/breezy/merge.py", line 792, in _compute_transform entries = list(self._entries3()) File "/tmp/tarmac/branch.xxlbrgzh/breezy/merge.py", line 871, in _entries3 this_parent = this_entry.parent_id AttributeError: 'GitTreeDirectory' object has no attribute 'parent_id' ---------------------------------------------------------------------- Ran 33529 tests in 2120.209s FAILED (errors=82, known_failure_count=49) 2127 tests skipped Missing feature 'Filesystem treats '\' as a directory separator.' skipped 5 tests. Missing feature 'Missing tdb' skipped 6 tests. Missing feature 'Not running as root' skipped 10 tests. Missing feature '_winreg' skipped 3 tests. Missing feature 'apport.report' skipped 1 tests. Missing feature 'attrib Windows command-line tool' skipped 1 tests. Missing feature 'breezy._walkdirs_win32' skipped 11 tests. Missing feature 'case-insensitive case-preserving filesystem' skipped 20 tests. Missing feature 'case-insensitive filesystem' skipped 1 tests. Missing feature 'git executable' skipped 34 tests. Missing feature 'meliae.scanner' skipped 5 tests. Missing feature 'msgmerge executable' skipped 2 tests. Missing feature 'pyinotify' skipped 16 tests. Missing feature 'pywintypes' skipped 1 tests. Missing feature 'quilt executable' skipped 21 tests. Missing feature 'win32 platform' skipped 9 tests. breezy.tests.test_test_server.TestTCPServerInAThread.test_server_fails_while_serving_or_stopping(TestingThreadingTCPServer) is leaking threads among 1 leaking tests. 1 non-main threads were left active in the end.