Skip to content

Commit 5e2eccc

Browse files
committed
fix download base files + import
1 parent 411d3e1 commit 5e2eccc

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

mergin/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import typing
1818
import warnings
1919

20-
from mergin.models import (
20+
from .models import (
2121
ProjectDelta,
2222
ProjectDeltaItemDiff,
2323
ProjectDeltaItem,

mergin/client_pull.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -561,6 +561,7 @@ def pull_project_async(mc, directory) -> Optional[PullJob]:
561561
# Force use COPY_CONFLICT action to apply the new version instead of trying to apply diffs
562562
# We are not able to get local changes anyway as base file is missing
563563
pull_action.type = PullActionType.COPY_CONFLICT
564+
pull_actions.append(pull_action)
564565
continue
565566

566567
# if we have diff to apply, let's download the diff files

0 commit comments

Comments
 (0)