Skip to content

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented May 17, 2022

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #2385

@blizzz
Copy link
Member

blizzz commented May 19, 2022

backport is incomplete

@Raudius Raudius force-pushed the backport/2385/stable22 branch 4 times, most recently from 200dfe2 to a783e9a Compare May 19, 2022 11:27
@Raudius
Copy link
Contributor

Raudius commented May 19, 2022

@juliushaertl
Had to use a different implementation for this (and stable23) backport.

We changed the way we fetch the file for 24 (for the file locking?) and it is done as part of the create call but I also noticed that the SyncService in 24 still performs the fetch call. So maybe we need to implement something similar to this there as well?

@juliusknorr
Copy link
Member

Not from locking but #2225

I didn't remember that the fetch call was still in use in some places, but yes then we should probably forward-port the fetch part also to stable24 and master

@Raudius Raudius force-pushed the backport/2385/stable22 branch from a783e9a to 12f7be6 Compare May 25, 2022 12:20
@mejo-
Copy link
Member

mejo- commented Jun 9, 2022

/rebase

Signed-off-by: Raul <raul@nextcloud.com>
@Raudius Raudius force-pushed the backport/2385/stable22 branch 3 times, most recently from 98d93e8 to 771b7d5 Compare June 9, 2022 12:20
Signed-off-by: Raul <raul@nextcloud.com>
Signed-off-by: Raul <raul@nextcloud.com>
@juliusknorr juliusknorr merged commit 4228c40 into stable22 Jun 9, 2022
@delete-merged-branch delete-merged-branch bot deleted the backport/2385/stable22 branch June 9, 2022 19:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants