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

merge: conflicts information might be missing in case of multiple line conflicts

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Critical
    • Resolution: Fixed
    • Affects Version/s: 11.7-rc-1
    • Fix Version/s: 11.8-rc-1
    • Component/s: Diff
    • Labels:
      None
    • Tests:
      Unit
    • Difficulty:
      Unknown
    • Documentation:
      N/A
    • Documentation in Release Notes:
      N/A
    • Similar issues:

      Description

      In case of the merge of 3 lines, if in next version all lines changed, and in current version the first and last lines changed, then one conflict is detected, and the associated chunk for the current version only concerns the first line.
      So we basically lose the information about the last line conflict.

      The expected result here is not clear, it can be:
      1. to return 2 conflicts, for the first line and for the last line: the chunk of next version should only concern the first line then
      2. to return 1 conflict but then to return in both case all 3 lines.

        Attachments

          Activity

            People

            • Assignee:
              surli Simon Urli
              Reporter:
              surli Simon Urli
            • Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: