Merge made by the 'recursive' strategy.
 docs/package-loader-specifications.rst         |  6 +++---
 swh/loader/package/crates/loader.py            |  2 +-
 swh/loader/package/crates/tests/test_crates.py | 26 +++++++++++++-------------
 3 files changed, 17 insertions(+), 17 deletions(-)

Changes applied before test

commit 920987f08992eddb31c92992fe970fb2c7934187
Merge: d925d06 de29163
Author: Jenkins user <jenkins@localhost>
Date:   Thu Jun 16 12:04:55 2022 +0000

    Merge branch 'diff-target' into HEAD

commit de29163511759fb2126d775ade10acea914f1422
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jun 16 14:04:20 2022 +0200

    crates: Fix incorrect documentation of release format

commit ab167227951024dea5f946be2878217a758b02d8
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jun 16 14:03:55 2022 +0200

    crates: Add missing newline in release message
    
    They should use the same convention as Git.

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

Harbormaster completed remote builds in B29905: Diff 28819.Jun 16 2022, 2:08 PM

vlorentz requested review of this revision.Jun 16 2022, 2:08 PM

ok, one question inline though

docs/package-loader-specifications.rst
56	why the shorter names?

ardumont accepted this revision.Jun 16 2022, 2:12 PM

This revision is now accepted and ready to land.Jun 16 2022, 2:12 PM

(i thought that was just aligning existing implementation, i noticed only now the depends on the other diff ¯\_(ツ)_/¯)

for consistency with the "npm" row

rebase

Build is green

Patch application report for D7999 (id=28869)

Could not rebase; Attempt merge onto b6af2638c1...

Updating b6af263..d627c25
Fast-forward
 docs/package-loader-specifications.rst         |  6 +++---
 swh/loader/package/crates/loader.py            |  2 +-
 swh/loader/package/crates/tests/test_crates.py | 26 +++++++++++++-------------
 3 files changed, 17 insertions(+), 17 deletions(-)

Changes applied before test

commit d627c2598a0e326b6c66bd285bd3bee8cb7d1d55
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jun 16 14:04:20 2022 +0200

    crates: Fix incorrect documentation of release format

commit aefc055d961cc52aac9d202bb161dc6b29a70492
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jun 16 14:03:55 2022 +0200

    crates: Add missing newline in release message
    
    They should use the same convention as Git.

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

Harbormaster completed remote builds in B29956: Diff 28869.Jun 21 2022, 5:50 PM

vlorentz added a child revision: D8014: Add type annotations to all objstorage backends.Jun 21 2022, 6:18 PM

Closed by commit rDLDBASEd627c2598a0e: crates: Fix incorrect documentation of release format (authored by vlorentz). · Explain WhyJun 21 2022, 6:25 PM

This revision was automatically updated to reflect the committed changes.

vlorentz added a commit: rDLDBASEd627c2598a0e: crates: Fix incorrect documentation of release format.