Merge lp://qastaging/~jelmer/brz/move-timestamp into lp://qastaging/brz/3.3
Proposed by
Jelmer Vernooij
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~jelmer/brz/move-timestamp |
Merge into: | lp://qastaging/brz/3.3 |
Diff against target: |
596 lines (+174/-168) 13 files modified
breezy/builtins.py (+1/-1) breezy/bzr/bundle/bundle_data.py (+4/-2) breezy/bzr/bundle/serializer/__init__.py (+0/-2) breezy/bzr/bundle/serializer/v08.py (+3/-3) breezy/bzr/tests/__init__.py (+1/-0) breezy/bzr/tests/test_timestamp.py (+1/-82) breezy/bzr/timestamp.py (+15/-69) breezy/diff.py (+2/-2) breezy/merge_directive.py (+4/-3) breezy/patches.py (+54/-0) breezy/tests/__init__.py (+1/-2) breezy/tests/test_patches.py (+86/-0) breezy/tests/test_selftest.py (+2/-2) |
To merge this branch: | bzr merge lp://qastaging/~jelmer/brz/move-timestamp |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij | Approve | ||
Review via email:
|
Commit message
Move timestamp to breezy.bzr.
Description of the change
Move timestamp to breezy.bzr.
To post a comment you must log in.
Unmerged revisions
- 7769. By Jelmer Vernooij
-
Move patch date functions.
- 7768. By Jelmer Vernooij
-
Fix imports.
- 7767. By Jelmer Vernooij
-
Fix typing.
- 7766. By Jelmer Vernooij
-
Move timestamp to breezy.bzr.
The attempt to merge lp:~jelmer/brz/move-timestamp into lp:brz/3.3 failed. Command exited with 2.
Below is the output from the failed tests.
Collecting setuptools-gettext gettext- 0.1.1-py3- none-any. whl (10 kB) 11/site- packages (from setuptools-gettext) (65.6.3) gettext- 0.1.1 /tmp/tarmac/ branch. nag7lty4 python3/ dist-packages (from breezy==3.3.2.dev0) (1.26.12) python3/ dist-packages (from breezy==3.3.2.dev0) (0.0.8) python3/ dist-packages (from breezy==3.3.2.dev0) (5.1.0.dev0) python3/ dist-packages (from breezy==3.3.2.dev0) (0.2.3) python3/ dist-packages (from breezy==3.3.2.dev0) (6.0) python3/ dist-packages (from breezy==3.3.2.dev0) (0.0.12) python3/ dist-packages (from breezy==3.3.2.dev0) (0.20.50) python3/ dist-packages (from breezy==3.3.2.dev0) (1.10.17) 0.9.14. tar.gz (41 kB) ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━ 41.8/41.8 kB 1.2 MB/s eta 0:00:00 subunit- 1.4.2-py3- none-any. whl (106 kB) ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━ 106.8/106.8 kB 3.4 MB/s eta 0:00:00 2.5.0-py3- none-any. whl (181 kB) ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━ 182.0/182.0 kB 6.3 MB/s eta 0:00:00 0.5.0-py2. py3-none- any.whl (21 kB) python3/ dist-packages (from breezy==3.3.2.dev0) (5.0.4) python3/ dist-packages (from breezy==3.3.2.dev0) (2.12.0) python3/ dist-packages (from breezy==3.3.2.dev0) (1.18.0) epytext- 0.0.4.tar. gz (3.6 kB) 6.0.0-py3- none-any. whl (3.0 MB) ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━ 3.0/3.0 MB 10.1 MB/s eta...
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: urllib3>=1.24.1 in /usr/lib/
Requirement already satisfied: merge3 in /usr/lib/
Requirement already satisfied: configobj in /usr/lib/
Requirement already satisfied: patiencediff in /usr/lib/
Requirement already satisfied: pyyaml in /usr/lib/
Requirement already satisfied: fastbencode in /usr/lib/
Requirement already satisfied: dulwich>=0.20.46 in /usr/lib/
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/
Collecting fastimport
Downloading fastimport-
━━
Preparing metadata (setup.py): started
Preparing metadata (setup.py): finished with status 'done'
Collecting python-subunit
Downloading python_
━━
Collecting testtools
Downloading testtools-
━━
Collecting testscenarios
Downloading testscenarios-
Requirement already satisfied: flake8 in /usr/lib/
Requirement already satisfied: paramiko in /usr/lib/
Requirement already satisfied: gpg in /usr/lib/
Collecting sphinx-epytext
Downloading sphinx-
Preparing metadata (setup.py): started
Preparing metadata (setup.py): finished with status 'done'
Collecting sphinx
Downloading sphinx-
━━