Page MenuHomeSoftware Heritage

added last add forge now archivals to changelog
ClosedPublic

Authored by bchauvet on Nov 3 2022, 9:43 AM.

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 is green

Patch application report for D8802 (id=31726)

Rebasing onto 1171f1bfef...

Current branch diff-target is up to date.
Changes applied before test
commit a72787845d134dafd7967bc7f8cd0e13eb43d88b
Author: Benoit Chauvet <contact@benoitchauvet.com>
Date:   Thu Nov 3 09:41:52 2022 +0100

    added gentoo archival to changelog

See https://jenkins.softwareheritage.org/job/DDOC/job/build-on-diff/246/ for more details.

vlorentz added a subscriber: vlorentz.

Thanks.

Could you replace "added" with "Add" in the commit message and diff title, to follow https://docs.softwareheritage.org/devel/contributing/git-style-guide.html ?

This revision is now accepted and ready to land.Nov 3 2022, 1:28 PM
  • added last add forge now processed requests
bchauvet retitled this revision from added gentoo archival to changelog to added last add forge now archivals to changelog.Tue, Jan 3, 2:18 PM

Build has FAILED

Patch application report for D8802 (id=32420)

Rebasing onto 8d04650792...

First, rewinding head to replay your work on top of it...
Applying: added gentoo archival to changelog
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 added gentoo archival to changelog

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 8d04650792...

Already up to date.
Changes applied before test
commit 1c878bb3c1ed25fbccc1c5eb93746966a48ea8b0
Author: Benoit Chauvet <contact@benoitchauvet.com>
Date:   Tue Jan 3 14:08:50 2023 +0100

    added last add forge now processed request

commit a72787845d134dafd7967bc7f8cd0e13eb43d88b
Author: Benoit Chauvet <contact@benoitchauvet.com>
Date:   Thu Nov 3 09:41:52 2022 +0100

    added gentoo archival to changelog

Link to build: https://jenkins.softwareheritage.org/job/DDOC/job/build-on-diff/299/
See console output for more information: https://jenkins.softwareheritage.org/job/DDOC/job/build-on-diff/299/console

Add latest "Add forge Now" processed requests

This revision is now accepted and ready to land.Tue, Jan 3, 2:36 PM

Build has FAILED

Patch application report for D8802 (id=32421)

Rebasing onto 8d04650792...

First, rewinding head to replay your work on top of it...
Applying: Add last "Add Forge Now" processed requests
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 Add last "Add Forge Now" processed requests

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 8d04650792...

Already up to date.
Changes applied before test
commit ff869976c2b572228d4c9b4fbe556acefac6e2b5
Author: Benoit Chauvet <contact@benoitchauvet.com>
Date:   Thu Nov 3 09:41:52 2022 +0100

    Add last "Add Forge Now" processed requests

Link to build: https://jenkins.softwareheritage.org/job/DDOC/job/build-on-diff/300/
See console output for more information: https://jenkins.softwareheritage.org/job/DDOC/job/build-on-diff/300/console

Add latest add forge now archivals to changelog (merged conflict)

Build is green

Patch application report for D8802 (id=32423)

Rebasing onto 8d04650792...

Current branch diff-target is up to date.
Changes applied before test
commit 610632ddbeab0be4505fc3da3675762a6539cec1
Author: Benoit Chauvet <contact@benoitchauvet.com>
Date:   Thu Nov 3 09:41:52 2022 +0100

    Add last "Add Forge Now" processed requests

See https://jenkins.softwareheritage.org/job/DDOC/job/build-on-diff/301/ for more details.