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

AbstractRebaseDiff incorrectly handles conflict in added nodes

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Closed
    • Major
    • Resolution: Fixed
    • None
    • 0.19
    • None
    • None

    Description

      AbstractRebaseDiff#addExistingNode reports a conflict if a node of the same name is added to the parent. MicroKernel#rebase however specifies: "addExistingNode: A node has been added that is different from a node of them same name that has been added to the trunk.

      Attachments

        Issue Links

          Activity

            People

              mduerig Michael Dürig
              mduerig Michael Dürig
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: