mirror of
https://github.com/nextcloud/desktop.git
synced 2024-11-26 23:28:14 +03:00
a7c0cfc8eb
If the server has the 'uploadConflictFiles' capability conflict files will be uploaded instead of ignored. Uploaded conflict files have the following headers set during upload OC-Conflict: 1 OC-ConflictBaseFileId: 172489174instanceid OC-ConflictBaseMtime: 1235789213 OC-ConflictBaseEtag: myetag when the data is available. Downloads accept the same headers in return when downloading a conflict file. In the absence of server support clients will identify conflict files through the file name pattern and attempt to deduce the base fileid. Base etag and mtime can't be deduced though. The upload job for a new conflict file will be triggered directly from the job that created the conflict file now. No second sync run is necessary anymore. This commit does not yet introduce a 'username' like identifier that automatically gets added to conflict file filenames (to name the files foo_conflict-Fred-1345.txt instead of just foo_conflict-1345.txt). |
||
|---|---|---|
| .. | ||
| benchmarks | ||
| csync | ||
| manual/favlink | ||
| mockserver | ||
| scripts | ||
| CMakeLists.txt | ||
| owncloud_add_test.cmake | ||
| stub.cpp | ||
| syncenginetestutils.h | ||
| test_journal.db | ||
| testallfilesdeleted.cpp | ||
| testchecksumvalidator.cpp | ||
| testchunkingng.cpp | ||
| testconcaturl.cpp | ||
| testexcludedfiles.cpp | ||
| testfilesystem.cpp | ||
| testfolder.cpp | ||
| testfolderman.cpp | ||
| testfolderwatcher.cpp | ||
| testinotifywatcher.cpp | ||
| testnetrcparser.cpp | ||
| testoauth.cpp | ||
| testowncloudpropagator.cpp | ||
| testownsql.cpp | ||
| testplan.txt | ||
| testsyncconflict.cpp | ||
| testsyncengine.cpp | ||
| testsyncfileitem.cpp | ||
| testsyncfilestatustracker.cpp | ||
| testsyncjournaldb.cpp | ||
| testsyncmove.cpp | ||
| testupdater.cpp | ||
| testuploadreset.cpp | ||
| testutility.cpp | ||
| testxmlparse.cpp | ||