Merge made by the 'recursive' strategy.
 docs/specs/spec-meta-deposit.rst | 103 +++++++++++++++++++++------------------
 1 file changed, 55 insertions(+), 48 deletions(-)

Changes applied before test

commit c9c7d3fa48dd4774cd9dd53ddfad39af76666e2b
Merge: 7c5c84b5 3b2b01e8
Author: Jenkins user <jenkins@localhost>
Date:   Tue Sep 8 13:27:21 2020 +0000

    Merge branch 'diff-target' into HEAD

commit 3b2b01e8c239f057f06594f3cdc3327a7ef37434
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Sep 8 15:23:01 2020 +0200

    spec-meta-deposit: allow depositing metadata on all object types.
    
    We can do it easily, so there's no need to artificially
    restrict object types.

commit 70a1746a2a6de13ab23a7219e407ebac13118a38
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Sep 8 15:22:09 2020 +0200

    spec-meta-deposit: only allow depositing metadata on one object at a time.
    
    Depositing on multiple objects at the same time may have
    tricky semantics, and I don't see a use case right now.
    
    But we can allow later by simply using multiple tags in
    the <swh:reference> tree.

commit 0b5b85504af05ae5ea3eb4184b078d4ec299d95a
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Sep 8 15:19:45 2020 +0200

    spec-meta-deposit: clarify wording and examples.

commit 76c5256526f1706dd57e7f55573b2eb484e80767
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Sep 8 15:13:56 2020 +0200

    spec-meta-deposit: fix XML indent

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

Harbormaster completed remote builds in B14959: Diff 13731.Sep 8 2020, 3:29 PM

ardumont accepted this revision.Sep 8 2020, 5:01 PM

This revision is now accepted and ready to land.Sep 8 2020, 5:01 PM

vlorentz added a task: T2312: Review metadata deposit specs for metadata-only deposit.Sep 8 2020, 9:03 PM

vlorentz mentioned this in D3891: spec-meta-deposit: allow depositing metadata on all object types..Sep 11 2020, 10:28 AM

rebase

This revision was landed with ongoing or failed builds.Sep 11 2020, 10:35 AM

Closed by commit rDDEPed1f3e664e95: spec-meta-deposit: allow depositing metadata on all object types. (authored by vlorentz). · Explain Why

This revision was automatically updated to reflect the committed changes.

vlorentz added a commit: rDDEPed1f3e664e95: spec-meta-deposit: allow depositing metadata on all object types..

Build is green

Patch application report for D3894 (id=13819)

Could not rebase; Attempt merge onto de0ab7f6f2...

Updating de0ab7f6..ed1f3e66
Fast-forward
 docs/specs/spec-meta-deposit.rst | 103 +++++++++++++++++++++------------------
 1 file changed, 55 insertions(+), 48 deletions(-)

Changes applied before test

commit ed1f3e664e95605a37ccd2dc32557f7864b5c8af
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Sep 8 15:23:01 2020 +0200

    spec-meta-deposit: allow depositing metadata on all object types.
    
    We can do it easily, so there's no need to artificially
    restrict object types.

commit 70934cd578dfad0096b196358f2c7ac8b1d714b6
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Sep 8 15:22:09 2020 +0200

    spec-meta-deposit: only allow depositing metadata on one object at a time.
    
    Depositing on multiple objects at the same time may have
    tricky semantics, and I don't see a use case right now.
    
    But we can allow later by simply using multiple tags in
    the <swh:reference> tree.

commit d76fceef776e8f5a2969f1f7d285431f859fd837
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Sep 8 15:19:45 2020 +0200

    spec-meta-deposit: clarify wording and examples.

commit 88381e36c75d0ff45f6a4dab49f21186d6e23003
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Sep 8 15:13:56 2020 +0200

    spec-meta-deposit: fix XML indent

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

Harbormaster completed remote builds in B15044: Diff 13819.Sep 11 2020, 10:36 AM