Page MenuHomeSoftware Heritage

Add mapping for sha1 with SWH ids
AbandonedPublicDraft

Authored by TG1999 on Fri, Jan 8, 4:56 PM.

Details

Reviewers
None
Group Reviewers
Reviewers
Summary

Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

Diff Detail

Event Timeline

Build has FAILED

Patch application report for D4828 (id=17100)

Rebasing onto 31111a6fe2...

First, rewinding head to replay your work on top of it...
Applying: Add mapping for sha1 with SWH ids
Using index info to reconstruct a base tree...
M	requirements-swh.txt
Falling back to patching base and 3-way merge...
Auto-merging requirements-swh.txt
CONFLICT (content): Merge conflict in requirements-swh.txt
Patch failed at 0001 Add mapping for sha1 with SWH ids

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 31111a6fe2...

Already up to date.
Changes applied before test
commit 709b8783e50421f2894e3a05568c0b0f2e492bac
Author: Tushar Goel <tushar.goel.dav@gmail.com>
Date:   Fri Jan 8 21:26:23 2021 +0530

    Add mapping for sha1 with SWH ids
    
    Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

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

Harbormaster returned this revision to the author for changes because remote builds failed.Fri, Jan 8, 4:57 PM
Harbormaster failed remote builds in B18243: Diff 17100!

Mapping for sha1 with SWH ids

Build has FAILED

Patch application report for D4828 (id=17101)

Rebasing onto 31111a6fe2...

First, rewinding head to replay your work on top of it...
Applying: Add mapping for sha1 with SWH ids
Using index info to reconstruct a base tree...
M	requirements-swh.txt
Falling back to patching base and 3-way merge...
Auto-merging requirements-swh.txt
CONFLICT (content): Merge conflict in requirements-swh.txt
Patch failed at 0001 Add mapping for sha1 with SWH ids

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 31111a6fe2...

Already up to date.
Changes applied before test
commit 3bd67ba836b0852d1771c013437d5066d9a5686f
Author: Tushar Goel <tushar.goel.dav@gmail.com>
Date:   Fri Jan 8 21:29:17 2021 +0530

    Add mapping for sha1 with SWH ids
    
    Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

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

Harbormaster returned this revision to the author for changes because remote builds failed.Fri, Jan 8, 5:01 PM
Harbormaster failed remote builds in B18244: Diff 17101!

Add mapping for sha1 with SWH ids

Build has FAILED

Patch application report for D4828 (id=17102)

Rebasing onto 31111a6fe2...

First, rewinding head to replay your work on top of it...
Applying: Add mapping for sha1 with SWH ids
Changes applied before test
commit 702974c221846471dad2fc6bab5101d01ac4a9a2
Author: Tushar Goel <tushar.goel.dav@gmail.com>
Date:   Fri Jan 8 21:33:18 2021 +0530

    Add mapping for sha1 with SWH ids
    
    Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

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

Harbormaster returned this revision to the author for changes because remote builds failed.Fri, Jan 8, 5:04 PM
Harbormaster failed remote builds in B18245: Diff 17102!

Add mapping for sha1 with SWH ids

Harbormaster returned this revision to the author for changes because remote builds failed.Fri, Jan 8, 5:13 PM
Harbormaster failed remote builds in B18246: Diff 17103!

Add mapping for sha1 with SWH ids

Harbormaster returned this revision to the author for changes because remote builds failed.Fri, Jan 8, 5:56 PM
Harbormaster failed remote builds in B18249: Diff 17106!