Uploaded image for project: 'XWiki Commons'
  1. XWiki Commons
  2. XCOMMONS-300

Not very good merge when previous version is empty

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: 4.2
    • Fix Version/s: 4.3
    • Component/s: Diff
    • Labels:
      None
    • Tests:
      Unit
    • Documentation:
      N/A
    • Documentation in Release Notes:
      N/A
    • Similar issues:

      Description

      A merge with:

      • previous version: ""
      • current version: "toto"
      • new version: "toto.tyty"

      with give: "totototo.tyty".

      That's because what is merged is a diff between previous/current and previous/new. Need to apply a diff again when two values are inserted in the same index of previous version.

        Attachments

          Activity

            People

            • Assignee:
              tmortagne Thomas Mortagne
              Reporter:
              tmortagne Thomas Mortagne
            • Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: