Uploaded image for project: 'Nuxeo Drive '
  1. Nuxeo Drive
  2. NXDRIVE-1695

Fix conflict resolving regression

    XMLWordPrintable

    Details

    • Type: Bug
    • Status: Resolved
    • Priority: Blocker
    • Resolution: Fixed
    • Affects Version/s: 4.1.3
    • Fix Version/s: 4.1.4
    • Component/s: Conflict management

      Description

      During NXDRIVE-1658, the ID role of the FileModel was removed as an unused attribute. Unfortunately, it was used by the conflict resolver as an argument when calling resolve_with_local() and resolve_with_remote().
      During NXDRIVE-1672, the line to refresh the conflicts was removed, the count of conflicts and errors below is thus incorrect.
      We need to revert these changes.

        Attachments

          Issue Links

          is caused by

          Bug - A problem which impairs or prevents the functions of the product. NXDRIVE-1672 Ensure Application.update_status() is passed an Engine

          • Minor - Minor loss of function, or other problem where easy workaround is present.
          • Resolved

          Improvement - An improvement or enhancement to an existing feature or task. NXDRIVE-1658 Reduce the complexity of abstract models data getter

          • Minor - Minor loss of function, or other problem where easy workaround is present.
          • Resolved

            Activity

              People

              • Votes:
                0 Vote for this issue
                Watchers:
                3 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved:

                  Time Tracking

                  Estimated:
                  Original Estimate - Not Specified
                  Not Specified
                  Remaining:
                  Remaining Estimate - 0 minutes
                  0m
                  Logged:
                  Time Spent - 1 hour
                  1h