Merge made by the 'recursive' strategy.
 requirements-swh.txt                    |   2 +-
 swh/loader/git/converters.py            | 102 +++++++++++++--
 swh/loader/git/tests/test_converters.py | 216 ++++++++++++++++++++++++++++++--
 3 files changed, 300 insertions(+), 20 deletions(-)

Changes applied before test

commit 1029e9a39bbab32cfcac11f77f7cdb897c12d199
Merge: 64050aa c2947c1
Author: Jenkins user <jenkins@localhost>
Date:   Wed Jan 12 10:58:59 2022 +0000

    Merge branch 'diff-target' into HEAD

commit c2947c14bd7d7ae9209555caf4455f52fe109ab2
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Wed Jan 12 11:58:29 2022 +0100

    converters: Write raw_manifest of Directory objects
    
    This allows representing git trees with disordered entries,
    as the "normal" data model requires them to be sorted.

commit 6808ddef4ff9a5f330ae384f3654d3acc38a5fb8
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Jan 7 17:27:10 2022 +0100

    converters: Write object_bytes and raw_manifest on revisions and releases
    
    This allows representing all git objects instead of rejecting
    objects that do not fit in our "normal" data model.
    
    This commit is restricted to revisions and releases for now,
    a future commit will add directories.

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

Harbormaster completed remote builds in B25957: Diff 25083.Jan 12 2022, 12:00 PM

vlorentz requested review of this revision.Jan 12 2022, 12:00 PM

vlorentz added a task: T3752: Store/represent time offsets as strings.Jan 12 2022, 3:24 PM

vlorentz added a child revision: D6939: Stop passing 'offset' and 'negative_utc' to TimestampWithTimezone().Jan 13 2022, 12:22 PM

Awesome, thanks.

This revision is now accepted and ready to land.Jan 14 2022, 6:29 PM

rebase

Build is green

Patch application report for D6923 (id=25228)

Could not rebase; Attempt merge onto 64050aa08b...

Updating 64050aa..dc63db4
Fast-forward
 requirements-swh.txt                    |   2 +-
 swh/loader/git/converters.py            | 102 +++++++++++++--
 swh/loader/git/tests/test_converters.py | 216 ++++++++++++++++++++++++++++++--
 3 files changed, 300 insertions(+), 20 deletions(-)

Changes applied before test

commit dc63db4c0c43e012167bd1d17eade5f6839e16fc
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Wed Jan 12 11:58:29 2022 +0100

    converters: Write raw_manifest of Directory objects
    
    This allows representing git trees with disordered entries,
    as the "normal" data model requires them to be sorted.

commit 44cc7d083327449594e93e8ad2d01abb6982be82
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Jan 7 17:27:10 2022 +0100

    converters: Write object_bytes and raw_manifest on revisions and releases
    
    This allows representing all git objects instead of rejecting
    objects that do not fit in our "normal" data model.
    
    This commit is restricted to revisions and releases for now,
    a future commit will add directories.

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

Harbormaster completed remote builds in B26089: Diff 25228.Jan 18 2022, 11:00 AM

Closed by commit rDLDGdc63db4c0c43: converters: Write raw_manifest of Directory objects (authored by vlorentz). · Explain WhyJan 18 2022, 11:02 AM

This revision was automatically updated to reflect the committed changes.

vlorentz added a commit: rDLDGdc63db4c0c43: converters: Write raw_manifest of Directory objects.