Details
- Reviewers
ardumont - Group Reviewers
Reviewers - Commits
- rDDOC9304ba7f479f: archive-changelog: Mention git integrity checks and package loaders writing…
Diff Detail
- Repository
- rDDOC Development documentation
- Lint
Automatic diff as part of commit; lint not applicable. - Unit
Automatic diff as part of commit; unit tests not applicable.
Event Timeline
Build has FAILED
Patch application report for D6696 (id=24321)
Rebasing onto 55cdfd9ee9...
First, rewinding head to replay your work on top of it... Applying: archive-changelog: Mention git integrity checks and package loaders writing releases Using index info to reconstruct a base tree... M docs/archive-changelog.rst Falling back to patching base and 3-way merge... Auto-merging docs/archive-changelog.rst CONFLICT (content): Merge conflict in docs/archive-changelog.rst Patch failed at 0001 archive-changelog: Mention git integrity checks and package loaders writing releases Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort".
Rebase failed (ret=1)!
Could not rebase; Attempt merge onto 55cdfd9ee9...
Already up to date.
Changes applied before test
commit ef3a55c68502f87599ccab7082b680489e0531cd
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date: Fri Nov 26 16:03:57 2021 +0100
archive-changelog: Mention git integrity checks and package loaders writing releasesLink to build: https://jenkins.softwareheritage.org/job/DDOC/job/build-on-diff/37/
See console output for more information: https://jenkins.softwareheritage.org/job/DDOC/job/build-on-diff/37/console
Build has FAILED
Patch application report for D6696 (id=24344)
Rebasing onto 55cdfd9ee9...
Current branch diff-target is up to date.
Changes applied before test
commit 72912978912b0e37e2c86b315507fadca9664d85
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date: Fri Nov 26 16:03:57 2021 +0100
archive-changelog: Mention git integrity checks and package loaders writing releasesLink to build: https://jenkins.softwareheritage.org/job/DDOC/job/build-on-diff/39/
See console output for more information: https://jenkins.softwareheritage.org/job/DDOC/job/build-on-diff/39/console
Build has FAILED
Patch application report for D6696 (id=24349)
Rebasing onto 55cdfd9ee9...
Current branch diff-target is up to date.
Changes applied before test
commit 9304ba7f479f7d9ab8e8c14e481e776505ef9e24
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date: Fri Nov 26 16:03:57 2021 +0100
archive-changelog: Mention git integrity checks and package loaders writing releasesLink to build: https://jenkins.softwareheritage.org/job/DDOC/job/build-on-diff/40/
See console output for more information: https://jenkins.softwareheritage.org/job/DDOC/job/build-on-diff/40/console