You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2024/06/04 08:11:27 UTC

(jackrabbit-oak) branch OAK-10852-c created (now a74bec31f1)

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

reschke pushed a change to branch OAK-10852-c
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


      at a74bec31f1 OAK-10852: disable BranchCommitGCTest unmergedAddsThenMergedAddThenUnmergedRemovesChildren for FullGCMode.ORPHANS_EMPTYPROPS_UNMERGED_BC

This branch includes the following new commits:

     new a74bec31f1 OAK-10852: disable BranchCommitGCTest unmergedAddsThenMergedAddThenUnmergedRemovesChildren for FullGCMode.ORPHANS_EMPTYPROPS_UNMERGED_BC

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



(jackrabbit-oak) 01/01: OAK-10852: disable BranchCommitGCTest unmergedAddsThenMergedAddThenUnmergedRemovesChildren for FullGCMode.ORPHANS_EMPTYPROPS_UNMERGED_BC

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch OAK-10852-c
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git

commit a74bec31f1fda6f04aa343ff4ed5677992fbad04
Author: Julian Reschke <re...@apache.org>
AuthorDate: Tue Jun 4 09:11:12 2024 +0100

    OAK-10852: disable BranchCommitGCTest unmergedAddsThenMergedAddThenUnmergedRemovesChildren for FullGCMode.ORPHANS_EMPTYPROPS_UNMERGED_BC
---
 .../org/apache/jackrabbit/oak/plugins/document/BranchCommitGCTest.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchCommitGCTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchCommitGCTest.java
index ec3025616d..cea34b85cc 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchCommitGCTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchCommitGCTest.java
@@ -389,6 +389,7 @@ public class BranchCommitGCTest {
 
     @Test
     public void unmergedAddsThenMergedAddThenUnmergedRemovesChildren() throws Exception {
+        assumeTrue(fullGcMode != FullGCMode.ORPHANS_EMPTYPROPS_UNMERGED_BC); // see OAK-10852
         RevisionVector br1 = unmergedBranchCommit(b -> {
             b.child("a");
             b.child("b");