Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reconcile: When detecting a local move, keep the local mtime #6632

Merged
merged 1 commit into from
Jul 5, 2018
Merged

Reconcile: When detecting a local move, keep the local mtime #6632

merged 1 commit into from
Jul 5, 2018

Conversation

ogoffart
Copy link
Contributor

@ogoffart ogoffart commented Jul 4, 2018

@ogoffart ogoffart mentioned this pull request Jul 4, 2018
Closed
@ogoffart ogoffart requested a review from ckamm July 4, 2018 15:27
@ogoffart
Copy link
Contributor Author

ogoffart commented Jul 5, 2018

(We might need to cherry pick in 2.4.2)

@guruz guruz added this to the 2.5.0 milestone Jul 5, 2018
@guruz
Copy link
Contributor

guruz commented Jul 5, 2018

@ogoffart Could we have some info about what you explained on IRC in a code comment around

client/src/libsync/syncfileitem.h

Line 233 in fabc706

time_t _modtime;
?

@guruz
Copy link
Contributor

guruz commented Jul 5, 2018

Appveyor failure is unrelated

executing command: C:\Program Files\Git\cmd\git.exe clone git://anongit.kde.org/craft-blueprints-kde C:\CraftMaster\windows-msvc2017_64-cl\etc\blueprints\locations\craft-blueprints-kde
Cloning into 'C:\CraftMaster\windows-msvc2017_64-cl\etc\blueprints\locations\craft-blueprints-kde'...
fatal: unable to connect to anongit.kde.org:
anongit.kde.org[0: 159.203.184.29]: errno=Invalid argument
Action: fetch for craft/craft-blueprints-kde FAILED
*** Craft all failed: craft/craft-blueprints-kde after 21 seconds ***
fatal error: package craft/craft-blueprints-kde all failed

@dschmidt

@guruz guruz merged commit 90ec9a9 into 2.5 Jul 5, 2018
@guruz guruz deleted the renamemtime branch July 5, 2018 14:31
@guruz
Copy link
Contributor

guruz commented Jul 5, 2018

cherry pick in #6635

mgallien added a commit to nextcloud/desktop that referenced this pull request Oct 16, 2024
@mgallien
remove the enforcement of identical etag for a server side item MOVE
6cf55b0 
orignally added by owncloud/client#6632

most probably a too strong assumption on the behavior of the Nextcloud
server

better check real item metadata like fileid, size or modification time

Signed-off-by: Matthieu Gallien <[email protected]>
mgallien added a commit to nextcloud/desktop that referenced this pull request Oct 16, 2024
@mgallien
remove the enforcement of identical etag for a server side item MOVE
2cf7a0c 
orignally added by owncloud/client#6632

most probably a too strong assumption on the behavior of the Nextcloud
server

better check real item metadata like fileid, size or modification time

Signed-off-by: Matthieu Gallien <[email protected]>
mgallien added a commit to nextcloud/desktop that referenced this pull request Oct 17, 2024
@mgallien
remove the enforcement of identical etag for a server side item MOVE
05b6db5 
orignally added by owncloud/client#6632

most probably a too strong assumption on the behavior of the Nextcloud
server

better check real item metadata like fileid, size or modification time

Signed-off-by: Matthieu Gallien <[email protected]>
backportbot bot pushed a commit to nextcloud/desktop that referenced this pull request Oct 17, 2024
@mgallien @backportbot
remove the enforcement of identical etag for a server side item MOVE
5751042 
orignally added by owncloud/client#6632

most probably a too strong assumption on the behavior of the Nextcloud
server

better check real item metadata like fileid, size or modification time

Signed-off-by: Matthieu Gallien <[email protected]>
backportbot bot pushed a commit to nextcloud/desktop that referenced this pull request Oct 17, 2024
@mgallien @backportbot
remove the enforcement of identical etag for a server side item MOVE
6817be0 
orignally added by owncloud/client#6632

most probably a too strong assumption on the behavior of the Nextcloud
server

better check real item metadata like fileid, size or modification time

Signed-off-by: Matthieu Gallien <[email protected]>
backportbot bot pushed a commit to nextcloud/desktop that referenced this pull request Oct 17, 2024
@mgallien @backportbot
remove the enforcement of identical etag for a server side item MOVE
1eb314c 
orignally added by owncloud/client#6632

most probably a too strong assumption on the behavior of the Nextcloud
server

better check real item metadata like fileid, size or modification time

Signed-off-by: Matthieu Gallien <[email protected]>
mgallien added a commit to nextcloud/desktop that referenced this pull request Oct 17, 2024
@mgallien
remove the enforcement of identical etag for a server side item MOVE
a758ab3 
orignally added by owncloud/client#6632

most probably a too strong assumption on the behavior of the Nextcloud
server

better check real item metadata like fileid, size or modification time

Signed-off-by: Matthieu Gallien <[email protected]>
mgallien added a commit to nextcloud/desktop that referenced this pull request Oct 17, 2024
@mgallien
remove the enforcement of identical etag for a server side item MOVE
08433c1 
orignally added by owncloud/client#6632

most probably a too strong assumption on the behavior of the Nextcloud
server

better check real item metadata like fileid, size or modification time

Signed-off-by: Matthieu Gallien <[email protected]>
mgallien added a commit to nextcloud/desktop that referenced this pull request Oct 17, 2024
@mgallien
remove the enforcement of identical etag for a server side item MOVE
810ac6e 
orignally added by owncloud/client#6632

most probably a too strong assumption on the behavior of the Nextcloud
server

better check real item metadata like fileid, size or modification time

Signed-off-by: Matthieu Gallien <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@guruz guruz guruz approved these changes

@ckamm ckamm Awaiting requested review from ckamm

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2.5.0
Development

Successfully merging this pull request may close these issues.
2 participants
@ogoffart @guruz