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

UnifiedDiffDisplayer: the conflicts should not be displayed by element, but by blocks

    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

      XCOMMONS-1706 introduced the ability to display the conflicts on a diff. However the conflicts have been wrongly put on the UnifiedDiffElement instead of putting them on the UnifiedBlockElements: right now it only allows to manage the conflicts on each element, even if it concerns a whole block, which really feels wrong.

        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: