projects / nextcloud-desktop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: df0df76) | patch
Propagate download: Fix restoring files for which the conflict file exists
authorOlivier Goffart <ogoffart@woboq.com>
Thu, 16 Apr 2015 09:21:39 +0000 (11:21 +0200)
committerOlivier Goffart <ogoffart@woboq.com>
Thu, 16 Apr 2015 09:36:01 +0000 (11:36 +0200)
commit8bb4af067a1fbb5173324137d23bd4323d5d4b4f
tree61b1c56b9db651d53772f5e07622646dd817410dtree | snapshot
parentdf0df76b513975296a6e1d908f9f98d782acc7c1commit | diff
Propagate download: Fix restoring files for which the conflict file exists

For issue #3106

1) Always use the actual timestamp from the file in the file system
to create the conflict file.  This is important because if one edit a
file several time, they should have different name. Also it makes more
sens to have the mtime of the modified file.

2) Give the correct size to the job so we know when the temporary file
is complete in case of resuming.
src/libsync/propagator_legacy.cpp diff | blob | history
src/libsync/syncengine.cpp diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.