Page MenuHomeSoftware Heritage

Commit a stupid thing to see whether stacked diffs do something useful
AbandonedPublic

Authored by olasd on Mar 27 2020, 7:46 PM.

Details

Reviewers
None
Group Reviewers
Reviewers
Summary

Depends on D2771.

Diff Detail

Repository
rDSTO Storage manager
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 11438
Build 17332: Phabricator diff pipeline on jenkinsJenkins console · Jenkins
Build 17331: arc lint + arc unit

Event Timeline

Build is green

The diff base commit is not an ancestor of the current repository HEAD

Summary of applied changes:
commit 479ec36f3b15ae26731f3d069e93f8f99a9f0d8c
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Fri Mar 27 19:45:18 2020 +0100

    Commit a stupid thing to see whether stacked diffs do something useful

commit 3d29938efed51ccaf17b5a62be456da629045d54
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Mar 5 14:18:41 2020 +0100

    Make release_add support adding the same object twice in the same call
    
    This is an edge case, but the mirror infrastructure is apparently hitting it. We
    modify the SQL query to be properly idempotent.

See https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/10/ for more details.

Build is green

Attempting merge...
Updating 570dce2..479ec36
Fast-forward
 sql/upgrades/147.sql              | 25 +++++++++++++++++++++++++
 swh/storage/sql/30-swh-schema.sql |  2 +-
 swh/storage/sql/40-swh-func.sql   |  7 ++++---
 swh/storage/tests/test_storage.py |  8 ++++++++
 4 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 sql/upgrades/147.sql

Summary of applied changes:

commit 479ec36f3b15ae26731f3d069e93f8f99a9f0d8c
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Fri Mar 27 19:45:18 2020 +0100

    Commit a stupid thing to see whether stacked diffs do something useful

commit 3d29938efed51ccaf17b5a62be456da629045d54
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Mar 5 14:18:41 2020 +0100

    Make release_add support adding the same object twice in the same call
    
    This is an edge case, but the mirror infrastructure is apparently hitting it. We
    modify the SQL query to be properly idempotent.

See https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/11/ for more details.

Build is green

Could not rebase; Attempting merge of D2921 (v. 10359) onto master...
Updating 570dce2..479ec36
Fast-forward
 sql/upgrades/147.sql              | 25 +++++++++++++++++++++++++
 swh/storage/sql/30-swh-schema.sql |  2 +-
 swh/storage/sql/40-swh-func.sql   |  7 ++++---
 swh/storage/tests/test_storage.py |  8 ++++++++
 4 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 sql/upgrades/147.sql

Summary of applied changes:

commit 479ec36f3b15ae26731f3d069e93f8f99a9f0d8c
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Fri Mar 27 19:45:18 2020 +0100

    Commit a stupid thing to see whether stacked diffs do something useful

commit 3d29938efed51ccaf17b5a62be456da629045d54
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Mar 5 14:18:41 2020 +0100

    Make release_add support adding the same object twice in the same call
    
    This is an edge case, but the mirror infrastructure is apparently hitting it. We
    modify the SQL query to be properly idempotent.

See https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/16/ for more details.

Build is green

Diff application report
Could not rebase; Attempt merge of D2921 (v. 10359) onto 570dce27c1...
Updating 570dce2..479ec36
Fast-forward
sql/upgrades/147.sql | 25 +++++++++++++++++++++++++
swh/storage/sql/30-swh-schema.sql | 2 +-
swh/storage/sql/40-swh-func.sql | 7 ++++---
swh/storage/tests/test_storage.py | 8 ++++++++
4 files changed, 38 insertions(+), 4 deletions(-)
create mode 100644 sql/upgrades/147.sql

Summary of applied changes:

See https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/17/ for more details.

Build is green

Diff application report

Could not rebase; Attempt merge of D2921 (v. 10359) onto 570dce27c1...

Updating 570dce2..479ec36
Fast-forward
 sql/upgrades/147.sql              | 25 +++++++++++++++++++++++++
 swh/storage/sql/30-swh-schema.sql |  2 +-
 swh/storage/sql/40-swh-func.sql   |  7 ++++---
 swh/storage/tests/test_storage.py |  8 ++++++++
 4 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 sql/upgrades/147.sql

Summary of applied changes:

commit 479ec36f3b15ae26731f3d069e93f8f99a9f0d8c
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Fri Mar 27 19:45:18 2020 +0100

    Commit a stupid thing to see whether stacked diffs do something useful

commit 3d29938efed51ccaf17b5a62be456da629045d54
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Mar 5 14:18:41 2020 +0100

    Make release_add support adding the same object twice in the same call
    
    This is an edge case, but the mirror infrastructure is apparently hitting it. We
    modify the SQL query to be properly idempotent.

See https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/19/ for more details.

Build is green

Patch application report for D2921 (id=10359)

Could not rebase; Attempt merge onto 570dce27c1...

Updating 570dce2..479ec36
Fast-forward
 sql/upgrades/147.sql              | 25 +++++++++++++++++++++++++
 swh/storage/sql/30-swh-schema.sql |  2 +-
 swh/storage/sql/40-swh-func.sql   |  7 ++++---
 swh/storage/tests/test_storage.py |  8 ++++++++
 4 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 sql/upgrades/147.sql
Changes applied before test
commit 479ec36f3b15ae26731f3d069e93f8f99a9f0d8c
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Fri Mar 27 19:45:18 2020 +0100

    Commit a stupid thing to see whether stacked diffs do something useful

commit 3d29938efed51ccaf17b5a62be456da629045d54
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Mar 5 14:18:41 2020 +0100

    Make release_add support adding the same object twice in the same call
    
    This is an edge case, but the mirror infrastructure is apparently hitting it. We
    modify the SQL query to be properly idempotent.

See https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/22/ for more details.