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

merge: no way to fallback on another value than current if current is empty

    Details

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

      Description

      In case of 3-way merge that involves an empty value for current, the result will be always an empty value, even if the fallback configuration stated that it should fallback on previous or next version
      Moreover the problem is not logged as a conflict, the only log error being "The current value is empty". Note that this is not the case if it's next that is empty.
      We should have the same mechanism if it's next or current that is empty, and this should be logged and processed as a conflict.

        Attachments

          Issue Links

            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: