You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2021/08/25 15:49:42 UTC

[sling-org-apache-sling-testing-sling-mock] branch feature/SLING-5922-SLING-10753-load-folder-and-filevault updated (d7c97d6 -> a6d01ff)

This is an automated email from the ASF dual-hosted git repository.

sseifert pushed a change to branch feature/SLING-5922-SLING-10753-load-folder-and-filevault
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git.


 discard d7c97d6  SLING-10753/SLING-5922 support mounting folders with JSON (Sling-Initial-Content) and FileValue XML (extracted content package) content support loading individual FileVault XML files
     add a6d01ff  SLING-10753/SLING-5922 support mounting folders with JSON (Sling-Initial-Content) and FileValue XML (extracted content package) content support loading individual FileVault XML files

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (d7c97d6)
            \
             N -- N -- N   refs/heads/feature/SLING-5922-SLING-10753-load-folder-and-filevault (a6d01ff)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .../testing/mock/sling/loader/ContentLoader.java   | 26 ++++++++++++----------
 .../AbstractContentLoaderFileVaultXmlTest.java     |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)