Merge lp://staging/~jelmer/brz/newer-dulwich-3.3 into lp://staging/brz/3.3
Proposed by
Jelmer Vernooij
Status: | Merged |
---|---|
Approved by: | Jelmer Vernooij |
Approved revision: | 7807 |
Merged at revision: | 7804 |
Proposed branch: | lp://staging/~jelmer/brz/newer-dulwich-3.3 |
Merge into: | lp://staging/brz/3.3 |
Diff against target: |
721 lines (+250/-80) 10 files modified
Makefile (+2/-2) breezy/git/memorytree.py (+1/-1) breezy/git/tests/test_workingtree.py (+4/-6) breezy/git/transform.py (+4/-7) breezy/git/tree.py (+63/-37) breezy/git/workingtree.py (+159/-20) breezy/tests/per_workingtree/test_commit.py (+1/-1) breezy/tests/per_workingtree/test_merge_from_branch.py (+1/-1) breezy/tests/per_workingtree/test_transform.py (+12/-2) pyproject.toml (+3/-3) |
To merge this branch: | bzr merge lp://staging/~jelmer/brz/newer-dulwich-3.3 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij | Approve | ||
Review via email: mp+450513@code.staging.launchpad.net |
Commit message
Fix compatibility with newer versions of dulwich
Description of the change
Fix compatibility with newer versions of dulwich
To post a comment you must log in.
The attempt to merge lp:~jelmer/brz/newer-dulwich-3.3 into lp:brz/3.3 failed. Command exited with 2.
Below is the output from the failed tests.
Collecting setuptools-gettext gettext- 0.1.3-py3- none-any. whl (10 kB) 11/site- packages (from setuptools-gettext) (68.1.2) gettext- 0.1.3 /tmp/tarmac/ branch. t__e8xfr python3/ dist-packages (from breezy==3.3.4.dev0) (5.0.8) python3/ dist-packages (from breezy==3.3.4.dev0) (0.2) python3/ dist-packages (from breezy==3.3.4.dev0) (0.2.13) python3/ dist-packages (from breezy==3.3.4.dev0) (0.0.8) /files. pythonhosted. org/packages/ d5/6d/b2a3ddaf1 dce030237e135de 9de911656965986 2b664696dd48fa5 a2d26d/ dulwich- 0.21.6- cp311-cp311- manylinux_ 2_17_x86_ 64.manylinux201 4_x86_64. whl.metadata 0.21.6- cp311-cp311- manylinux_ 2_17_x86_ 64.manylinux201 4_x86_64. whl.metadata (4.3 kB) python3/ dist-packages (from breezy==3.3.4.dev0) (1.26.12) python3/ dist-packages (from breezy==3.3.4.dev0) (6.0) 2.6.0-py3- none-any. whl (182 kB) ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━ 182.2/182.2 kB 6.6 MB/s eta 0:00:00 0.5.0-py2. py3-none- any.whl (21 kB) subunit- 1.4.2-py3- none-any. whl (106 kB) ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━ 106.8/106.8 kB 6.3 MB/s eta 0:00:00 python3/ dist-packages (from breezy==3.3.4.dev0) (5.0.4) /files. pythonhosted. org/packages/ d9/fc/3a49ab49a e556b7d644a2d30 82f01082bb902be fe3e398f11d675d 6c2ad0/ Cython- 3.0.2-cp311- cp311-manylinux _2_17_x86_ 64.manylinux201 4_x86_64. whl.metadata 3.0.2-cp311- cp311-manylinux _2_17_x86_ 64.manylinux201 4_x86_64. whl.metadata (3.1 kB)
Downloading setuptools_
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.
Installing collected packages: setuptools-gettext
Successfully installed setuptools-
Obtaining file://
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'
Installing backend dependencies: started
Installing backend dependencies: 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/
Requirement already satisfied: fastbencode in /usr/lib/
Requirement already satisfied: patiencediff in /usr/lib/
Requirement already satisfied: merge3 in /usr/lib/
Collecting dulwich>=0.21.6 (from breezy==3.3.4.dev0)
Obtaining dependency information for dulwich>=0.21.6 from https:/
Downloading dulwich-
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/
Requirement already satisfied: pyyaml in /usr/lib/
Collecting testtools (from breezy==3.3.4.dev0)
Downloading testtools-
━━
Collecting testscenarios (from breezy==3.3.4.dev0)
Downloading testscenarios-
Collecting python-subunit (from breezy==3.3.4.dev0)
Downloading python_
━━
Requirement already satisfied: flake8 in /usr/lib/
Collecting cython>=0.29 (from breezy==3.3.4.dev0)
Obtaining dependency information for cython>=0.29 from https:/
Using cached Cython-
Collecting docutils (from breezy==...