Uploaded image for project: 'XWiki Platform'
  1. XWiki Platform
  2. XWIKI-18908

Handle properly xobjects conflicts when merging documents

    XMLWordPrintable

Details

    • Improvement
    • Resolution: Unresolved
    • Major
    • None
    • 12.10.8
    • Storage - Merge
    • None
    • Unknown

    Description

      Right now only conflicts related to content of the documents are recorded. In case of conflicts on other parts of the document we only log an error, but we never expose the actual conflicts. We should improve that, at the very least for xobjects and xclasses.

      Attachments

        Issue Links

          blocks

          Bug - A problem which impairs or prevents the functions of the product. CRAPP-254 In case of object conflict it's impossible to unlock a change request

          • Critical - Crashes, loss of data, severe memory leak.
          • Closed
          depends on

          Bug - A problem which impairs or prevents the functions of the product. XWIKI-20698 MergeResult is missing information about location of conflicts

          • Major - Major loss of function.
          • Open
          is related to

          Improvement - An improvement or enhancement to an existing feature or task. CRAPP-15 Handle conflicts before merging change request

          • Major - Major loss of function.
          • Closed

          Improvement - An improvement or enhancement to an existing feature or task. XWIKI-16464 Merge conflict: allow choice by chunks and custom fixes

          • Major - Major loss of function.
          • Closed

          Activity

            People

              Unassigned Unassigned
              surli Simon Urli
              Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

                Created:
                Updated: