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

Merge on Save

    XMLWordPrintable

Details

    • Improvement
    • Resolution: Fixed
    • Major
    • 11.5-rc-1, 11.3.2
    • 0.9.840
    • Old Core
    • None
    • edit lock
    • Integration
    • Low

    Description

      XWiki should use optimistic locking (like wikipedia or cvs/subversion) for locking documents for edit. If 2 users are editing a page, only the 2nd one to try and commit gets an error message asking them to merge their changes into the previous users commit.

      Attachments

        1. merge-conflict-modal.png
          69 kB
          Simon Urli
        2. merge-conflict-modal-usage.gif
          851 kB
          Simon Urli
        3. merge-conflict-modal-usage-v2.gif
          2.43 MB
          Simon Urli
        4. merge-conflict-modal-v2.png
          80 kB
          Simon Urli
        5. Var2BProposal.png
          453 kB
          Ecaterina Moraru (Valica)

        Issue Links

          is duplicated by

          Bug - A problem which impairs or prevents the functions of the product. XWIKI-3585 Saving a modification with a lost page lock should warn the user.

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

          Bug - A problem which impairs or prevents the functions of the product. XWIKI-6665 Saving edits after lock expiration doesn't warn the user that the page may be stale

          • Major - Major loss of function.
          • Closed

          Improvement - An improvement or enhancement to an existing feature or task. XWIKI-1531 Allow locking of individual document sections when editing sections

          • Major - Major loss of function.
          • Open

          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

          Improvement - An improvement or enhancement to an existing feature or task. XWIKI-16578 Add a conflict mechanism switch off property

          • Major - Major loss of function.
          • Closed
          relates to

          Improvement - An improvement or enhancement to an existing feature or task. XWIKI-16456 Inform users who are editing a document that a new version has been saved

          • Major - Major loss of function.
          • Open

          Activity

            People

              surli Simon Urli
              wr0ngway Matthew Conway
              Votes:
              6 Vote for this issue
              Watchers:
              9 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: