For server response with update:

- in complicated history could server return and client could not have in some version a file and raise would be there

Author: MarcelGeo

mergin/merginproject.py

@@ -514,7 +514,6 @@ def get_pull_action(
             (DeltaChangeType.CREATE, DeltaChangeType.UPDATE),
             (DeltaChangeType.CREATE, DeltaChangeType.DELETE),
             (DeltaChangeType.CREATE, DeltaChangeType.UPDATE_DIFF),
-            (DeltaChangeType.UPDATE, DeltaChangeType.CREATE),
             (DeltaChangeType.UPDATE_DIFF, DeltaChangeType.CREATE),
             (DeltaChangeType.DELETE, DeltaChangeType.CREATE),
         ]:
@@ -528,6 +527,7 @@ def get_pull_action(
             (DeltaChangeType.UPDATE, DeltaChangeType.UPDATE): PullActionType.COPY_CONFLICT,
             (DeltaChangeType.UPDATE, DeltaChangeType.DELETE): PullActionType.COPY,
             (DeltaChangeType.UPDATE, DeltaChangeType.UPDATE_DIFF): PullActionType.COPY_CONFLICT,
+            (DeltaChangeType.UPDATE, DeltaChangeType.CREATE): PullActionType.COPY_CONFLICT,
             (DeltaChangeType.UPDATE_DIFF, None): PullActionType.APPLY_DIFF_NO_REBASE,  # without rebase
             (DeltaChangeType.UPDATE_DIFF, DeltaChangeType.UPDATE): PullActionType.COPY_CONFLICT,
             (DeltaChangeType.UPDATE_DIFF, DeltaChangeType.DELETE): PullActionType.COPY,

mergin/test/test_mergin_project.py

@@ -90,6 +90,7 @@ def test_get_pull_action_valid():
         (DeltaChangeType.UPDATE, DeltaChangeType.UPDATE, PullActionType.COPY_CONFLICT),
         (DeltaChangeType.UPDATE, DeltaChangeType.DELETE, PullActionType.COPY),
         (DeltaChangeType.UPDATE, DeltaChangeType.UPDATE_DIFF, PullActionType.COPY_CONFLICT),
+        (DeltaChangeType.UPDATE, DeltaChangeType.CREATE, PullActionType.COPY_CONFLICT),
         (DeltaChangeType.UPDATE_DIFF, None, PullActionType.APPLY_DIFF_NO_REBASE),
         (DeltaChangeType.UPDATE_DIFF, DeltaChangeType.UPDATE, PullActionType.COPY_CONFLICT),
         (DeltaChangeType.UPDATE_DIFF, DeltaChangeType.DELETE, PullActionType.COPY),
@@ -116,7 +117,6 @@ def test_get_pull_action_fatal():
         (DeltaChangeType.CREATE, DeltaChangeType.UPDATE),
         (DeltaChangeType.CREATE, DeltaChangeType.DELETE),
         (DeltaChangeType.CREATE, DeltaChangeType.UPDATE_DIFF),
-        (DeltaChangeType.UPDATE, DeltaChangeType.CREATE),
         (DeltaChangeType.UPDATE_DIFF, DeltaChangeType.CREATE),
         (DeltaChangeType.DELETE, DeltaChangeType.CREATE),
     ]