Skip to content

Conversation

@MarcelGeo
Copy link
Contributor

@MarcelGeo MarcelGeo commented Sep 25, 2025

Resolves #774

See relate workflow in MerginMaps/python-api-client#262

In case of conflicted sync, we are trying to restart process after 5 sec for 10 times

image

  • we could change branch after release 0.11.0 of py client and 4.0 of plugin
  • update texts in dialogues
  • compatible with py client with get_push_changes_batch function

has_push_changes = True
error_retries_attempts = 0
while has_push_changes:
dlg = SyncDialog()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to create dlg in while loop?

Copy link
Contributor Author

@MarcelGeo MarcelGeo Sep 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pull and push is creating own sync dialog. I think there were some issue as I know @wonder-sk , that we need to recreate SyncDialog. But of course, we can try version without recreating dialog. Not sure If exec will be ok there.

@MarcelGeo MarcelGeo requested a review from varmar05 September 30, 2025 15:21
@MarcelGeo MarcelGeo requested a review from tomasMizera October 9, 2025 18:43
@MarcelGeo MarcelGeo changed the base branch from dev-2025.4.0 to dev-2025.4.1 October 31, 2025 10:22
@MarcelGeo
Copy link
Contributor Author

tests running properly with py-client with concurrent push.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants