Uploaded image for project: 'Jackrabbit Oak'
  1. Jackrabbit Oak
  2. OAK-1553

More sophisticated conflict resolution when concurrently adding nodes

    XMLWordPrintableJSON

    Details

      Description

      MicroKernel.rebase currently specifies: "addExistingNode: A node has been added that is different from a node of them same name that has been added to the trunk."

      This is somewhat troublesome in the case where the same node with different but non conflicting child items is added concurrently:

      f.add("fo").add("u1"); commit();
      f.add("fo").add("u2"); commit();
      

      currently fails with a conflict because fo is not the same node for the both cases. See discussion http://markmail.org/message/flst4eiqvbp4gi3z

        Attachments

        1. OAK-1553.patch
          9 kB
          Michael Dürig

          Issue Links

            Activity

              People

              • Assignee:
                Unassigned
                Reporter:
                mduerig Michael Dürig
              • Votes:
                0 Vote for this issue
                Watchers:
                6 Start watching this issue

                Dates

                • Created:
                  Updated: