[OAK-6267] Version restore fails if restore would not change bundling root but changes bundled nodes

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: 1.6.0
• Fix Version/s: 1.7.1, 1.6.2, 1.8.0
• Component/s: documentmk
• Assignee: Chetan Mehrotra
• Reporter: Vikas Saurabh
• Created: 26/May/17 00:51
• Updated: 09/Jun/17 12:53
• Resolved: 26/May/17 11:39

Description

Following test case in VersionedDocumentBundlingTest fails:

    @Test
    public void restoreVersionedNode() throws Exception{
        String assetParentPath = "/bundlingtest/par";
        Node asset = JcrUtils.getOrCreateByPath(assetParentPath + "/foo.png", "oak:Unstructured", "oak:Asset", s, false);
        Node assetParent = s.getNode(assetParentPath);
        assetParent.addMixin(JcrConstants.MIX_VERSIONABLE);
        asset.addNode("jcr:content", "oak:Unstructured");
        s.save();

        VersionManager vm = s.getWorkspace().getVersionManager();
        Version version = vm.checkin(assetParentPath);
        vm.checkout(assetParentPath);

        asset.getNode("jcr:content").setProperty("foo1", "bar1");
        s.save();

        vm.restore(version, true);
    }

The important point that needs to happen is that restore process needs to let bundle-root-node (/bundlingtest/par/foo.png) untouched BUT needs to change a bundled node (/bundlingtest/par/foo.png/jcr:content).