Merge lp://qastaging/~jelmer/brz/git-fetch-fixes-simpler into lp://qastaging/brz/3.3
- git-fetch-fixes-simpler
- Merge into 3.3
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~jelmer/brz/git-fetch-fixes-simpler |
Merge into: | lp://qastaging/brz/3.3 |
Diff against target: |
42 lines (+7/-4) 2 files modified
breezy/git/interrepo.py (+4/-3) breezy/git/push.py (+3/-1) |
To merge this branch: | bzr merge lp://qastaging/~jelmer/brz/git-fetch-fixes-simpler |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij | Approve | ||
Review via email:
|
Commit message
Fix git fetching
Description of the change
Fix git fetching

The Breezy Bot (the-breezy-bot) wrote : | # |

The Breezy Bot (the-breezy-bot) wrote : | # |
The attempt to merge lp:~jelmer/brz/git-fetch-fixes-simpler into lp:brz/3.3 failed. Command exited with 1.
Below is the output from the failed tests.
Collecting setuptools-gettext
Using cached 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'
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.2
Using cached dulwich-
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/
Requirement already satisfied: pyyaml in /usr/lib/
Collecting testtools
Using cached testtools-
Collecting testscenarios
Using cached testscenarios-
Collecting python-subunit
Using cached python_
Requirement already satisfied: flake8 in /usr/lib/
Collecting docutils
Using cached docutils-
Requirement already satisfied: setuptools in ./lib/python3.
Collecting sphinx
Using cached sphinx-
Collecting sphinx-epytext
Using cached sphinx_
Collecting fastimport
Using cached fastimport-
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/
Requirement already satisfied: paramiko in /usr/local/
Requirement already satisfied: gpg in /usr/lib/
Requirement already satisfied: httplib2 in /usr/lib/
Requirement already satisfied: lazr.restfulcli
Requirement al...

The Breezy Bot (the-breezy-bot) wrote : | # |
The attempt to merge lp:~jelmer/brz/git-fetch-fixes-simpler into lp:brz/3.3 failed. Command exited with 1.
Below is the output from the failed tests.
Collecting setuptools-gettext
Using cached 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.2
Using cached dulwich-
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/
Requirement already satisfied: pyyaml in /usr/lib/
Collecting testtools
Using cached testtools-
Collecting testscenarios
Using cached testscenarios-
Collecting python-subunit
Using cached python_
Requirement already satisfied: flake8 in /usr/lib/
Collecting docutils
Using cached docutils-
Requirement already satisfied: setuptools in ./lib/python3.
Collecting sphinx
Using cached sphinx-
Collecting sphinx-epytext
Using cached sphinx_
Collecting fastimport
Using cached fastimport-
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/
Requirement already satisfied: paramiko in /usr/local/
Requirement already satisfied: gpg in /usr/lib/
Requirement already satisfied: httplib2 in /usr/lib/
Requirement already satisfied: lazr.restfulcli

The Breezy Bot (the-breezy-bot) wrote : | # |
The attempt to merge lp:~jelmer/brz/git-fetch-fixes-simpler into lp:brz/3.3 failed. Command exited with 1.
Below is the output from the failed tests.
Collecting setuptools-gettext
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.2
Downloading dulwich-
━━
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/
Requirement already satisfied: pyyaml in /usr/lib/
Collecting testtools
Downloading testtools-
━━
Collecting testscenarios
Downloading testscenarios-
Collecting python-subunit
Downloading python_
━━
Requirement already satisfied: flake8 in /usr/lib/
Collecting docutils
Downloading docutils-
━━
Requirement already satisfied: setuptools in ./lib/python3.
Collecting sphinx
Downloading sphinx-
━━
Collecting sphinx-epytext
Downloading sphinx-
Preparing metadata (setup.py): started
Preparing metadata (setup.py): finished with status 'done'
Collecting fastimport
Downloading fastimport-
━━

The Breezy Bot (the-breezy-bot) wrote : | # |
The attempt to merge lp:~jelmer/brz/git-fetch-fixes-simpler into lp:brz/3.3 failed. Command exited with 1.
Below is the output from the failed tests.
Collecting setuptools-gettext
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.2
Downloading dulwich-
━━
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/
Requirement already satisfied: pyyaml in /usr/lib/
Collecting testtools
Downloading testtools-
━━
Collecting testscenarios
Downloading testscenarios-
Collecting python-subunit
Downloading python_
━━
Requirement already satisfied: flake8 in /usr/lib/
Collecting cython>=0.29
Using cached Cython-
Collecting docutils
Downloading docutils-
━━
Requirement already satisfied: setuptools in ./lib/python3.
Collecting sphinx
Downloading sphinx-
━━
Collecting sphinx-epytext
Downloading sphinx-
Preparing metadata (setup.py): started
Preparing metadata (set...

The Breezy Bot (the-breezy-bot) wrote : | # |
Attempt to merge into lp:brz/3.3 failed due to conflicts:
text conflict in breezy/
text conflict in breezy/

The Breezy Bot (the-breezy-bot) wrote : | # |
Attempt to merge into lp:brz/3.3 failed due to conflicts:
text conflict in breezy/
text conflict in breezy/
- 7792. By Jelmer Vernooij
-
Merge lp:brz/3.3
Unmerged revisions
- 7792. By Jelmer Vernooij
-
Merge lp:brz/3.3
- 7791. By Jelmer Vernooij
-
Fix git fetching.
The attempt to merge lp:~jelmer/brz/git-fetch-fixes-simpler into lp:brz/3.3 failed. Command exited with 1.
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) (66.1.1) gettext- 0.1.3 /tmp/tarmac/ branch. 36q80q_ s python3/ dist-packages (from breezy==3.3.3.dev0) (5.1.0.dev0) python3/ dist-packages (from breezy==3.3.3.dev0) (0.0.12) python3/ dist-packages (from breezy==3.3.3.dev0) (0.2.3) python3/ dist-packages (from breezy==3.3.3.dev0) (0.0.8) 0.21.3- cp311-cp311- manylinux_ 2_17_x86_ 64.manylinux201 4_x86_64. whl (508 kB) ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━ 508.2/508.2 kB 7.3 MB/s eta 0:00:00 python3/ dist-packages (from breezy==3.3.3.dev0) (1.26.12) python3/ dist-packages (from breezy==3.3.3.dev0) (6.0) 2.5.0-py3- none-any. whl (181 kB) ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━ 182.0/182.0 kB 8.9 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 4.4 MB/s eta 0:00:00 python3/ dist-packages (from breezy==3.3.3.dev0) (5.0.4) 0.19-py3- none-any. whl (570 kB) ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━ 570.5/570.5 kB 12.0 MB/s eta 0:00:00 11/site- packages (from breezy==3.3.3.dev0) (66.1.1) 6.1.3-py3- none-any. whl (3.0 MB) ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━ 3.0/3.0 MB 13.4 MB/s eta 0:00:00 epytext- 0.0.4.tar. gz (3.6 kB) 0.9.14. tar.gz (41 kB) ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━ 41.8/41.8 kB 6.7 MB/s eta 0:00:00
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'
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.2
Downloading dulwich-
━━
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/
Requirement already satisfied: pyyaml in /usr/lib/
Collecting testtools
Downloading testtools-
━━
Collecting testscenarios
Downloading testscenarios-
Collecting python-subunit
Downloading python_
━━
Requirement already satisfied: flake8 in /usr/lib/
Collecting docutils
Downloading docutils-
━━
Requirement already satisfied: setuptools in ./lib/python3.
Collecting sphinx
Downloading sphinx-
━━
Collecting sphinx-epytext
Downloading sphinx-
Preparing metadata (setup.py): started
Preparing metadata (setup.py): finished with status 'done'
Collecting fastimport
Downloading fastimport-
━━
Preparing metadata (setup.py): started
Preparing metadata (se...