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

Provide Common Ancestor To ConflictHandler

    XMLWordPrintableJSON

Details

    • Improvement
    • Status: Closed
    • Major
    • Resolution: Fixed
    • 1.3.5
    • 1.7.2, 1.8.0
    • core
    • None

    Description

      currently ConflictHandler_s are provided _ours and theirs, reflecting a memory state and persisted state of changes to the same root resulting in a conflict.

      unfortunately the information provided to ConflictHandlers does not include the common ancestor, needed for meaningful change-change merges (three-way merge).

      the core should be enhanced to provide such information to ConflictHandlers.

      Attachments

        1. OAK-3381-v1.patch
          66 kB
          Alex Deparvu
        2. OAK-3381-v0.patch
          25 kB
          Alex Deparvu

        Issue Links

          blocks

          Bug - A problem which impairs or prevents the functions of the product. OAK-3374 Concurrent Updates of Group's Membership Results in Conflict

          • Major - Major loss of function.
          • Closed
          breaks

          Bug - A problem which impairs or prevents the functions of the product. OAK-6379 NPE in MergingNodeStateDiff on DELETE_DELETED_PROPERTY

          • Major - Major loss of function.
          • Closed

          Activity

            People

              stillalex Alex Deparvu
              dominique.jaeggi Dominique Jäggi
              Votes:
              0 Vote for this issue
              Watchers:
              4 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: