{"action":"created","issue":{"url":"https://api.github.com/repos/owncloud/client/issues/4173","labels_url":"https://api.github.com/repos/owncloud/client/issues/4173/labels{/name}","comments_url":"https://api.github.com/repos/owncloud/client/issues/4173/comments","events_url":"https://api.github.com/repos/owncloud/client/issues/4173/events","html_url":"https://github.com/owncloud/client/issues/4173","id":118093439,"number":4173,"title":"Conflict files","user":{"login":"sasagit","id":3532767,"avatar_url":"https://avatars.githubusercontent.com/u/3532767?v=3","gravatar_id":"","url":"https://api.github.com/users/sasagit","html_url":"https://github.com/sasagit","followers_url":"https://api.github.com/users/sasagit/followers","following_url":"https://api.github.com/users/sasagit/following{/other_user}","gists_url":"https://api.github.com/users/sasagit/gists{/gist_id}","starred_url":"https://api.github.com/users/sasagit/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sasagit/subscriptions","organizations_url":"https://api.github.com/users/sasagit/orgs","repos_url":"https://api.github.com/users/sasagit/repos","events_url":"https://api.github.com/users/sasagit/events{/privacy}","received_events_url":"https://api.github.com/users/sasagit/received_events","type":"User","site_admin":false},"labels":[{"url":"https://api.github.com/repos/owncloud/client/labels/Needs%20info","name":"Needs info","color":"207de5"}],"state":"open","locked":false,"assignee":null,"milestone":{"url":"https://api.github.com/repos/owncloud/client/milestones/28","html_url":"https://github.com/owncloud/client/milestones/2.1.1-nextpatch","labels_url":"https://api.github.com/repos/owncloud/client/milestones/28/labels","id":1391157,"number":28,"title":"2.1.1-nextpatch","description":"","creator":{"login":"guruz","id":959327,"avatar_url":"https://avatars.githubusercontent.com/u/959327?v=3","gravatar_id":"","url":"https://api.github.com/users/guruz","html_url":"https://github.com/guruz","followers_url":"https://api.github.com/users/guruz/followers","following_url":"https://api.github.com/users/guruz/following{/other_user}","gists_url":"https://api.github.com/users/guruz/gists{/gist_id}","starred_url":"https://api.github.com/users/guruz/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/guruz/subscriptions","organizations_url":"https://api.github.com/users/guruz/orgs","repos_url":"https://api.github.com/users/guruz/repos","events_url":"https://api.github.com/users/guruz/events{/privacy}","received_events_url":"https://api.github.com/users/guruz/received_events","type":"User","site_admin":false},"open_issues":82,"closed_issues":27,"state":"open","created_at":"2015-11-03T12:20:40Z","updated_at":"2015-12-11T17:42:40Z","due_on":null,"closed_at":null},"comments":7,"created_at":"2015-11-20T18:01:28Z","updated_at":"2015-12-13T20:32:16Z","closed_at":null,"body":"After client update to version 2.0.2 sync items were removed. After adding sync items and syncing with server some conflict files were created. The problem is that older files were downloaded from server and newer were renamed to conflict.\r\n\r\n**Server info:**\r\nubuntu 10.10, Apache/2.2.16, mysql 5.1.61, PHP 5.6.8\r\nownCloud 8.1.1 (stable)\r\n\r\n**Client:**\r\nVersion 2.0.2 (build 5569)\r\n\r\n**Log from client (part involving one of the conflict files):**\r\n```\r\n11-20 18:29:01:599 0x8bb9728 csync_walker: file: C:/file.txt [inode=77464 size=48128]\r\n11-20 18:29:01:599 0x8bb9728 _csync_detect_update: Checking for rename based on inode # 77464\r\n11-20 18:29:01:599 0x8bb9728 _csync_detect_update: file: file.txt, instruction: INSTRUCTION_NEW <<=\r\n\r\n11-20 18:29:04:009 0x8bb9728 csync_walker: file: ownclouds://owncloudserver.com/remote.php/webdav/backup_dir/file.txt [file_id=00245604oc003a2ceea4 size=47616]\r\n11-20 18:29:04:009 0x8bb9728 _csync_detect_update: file: file.txt, instruction: INSTRUCTION_NEW <<=\r\n\r\n11-20 18:29:06:388 0x5c60e20 _csync_merge_algorithm_visitor: INSTRUCTION_NONE     client file: file.txt\r\n\r\n11-20 18:29:06:624 0x5c60e20 _csync_merge_algorithm_visitor: INSTRUCTION_CONFLICT server file: file.txt\r\n\r\n11-20 18:29:07:252 0x5c60e20 OCC::SyncJournalDb::setFileRecord: \"INSERT OR REPLACE INTO metadata (phash, pathlen, path, inode, uid, gid, mode, modtime, type, md5, fileid, remotePerm, filesize, ignoredChildrenRemote) VALUES (?1 , ?2, ?3 , ?4 , ?5 , ?6 , ?7,  ?8 , ?9 , ?10, ?11, ?12, ?13, ?14);\" -9140714609822354211 30 \"racuni/2010/racun-019-2010.pdf\" 221233 0 \"1291811505\" \"0\" \"54724846f1d8e\" \"00152931oc003a2ceea4\" \"RDNVW\" 78090 0\r\n11-20 18:29:07:252 0x5c60e20 OCC::SocketApi::sendMessage: SocketApi:  Sending message:  \"STATUS:SYNC:C:\\file.txt\"\r\n\r\n11-20 18:29:07:881 0x5c60e20 OCC::PropagateDownloadFileQNAM::start: virtual void OCC::PropagateDownloadFileQNAM::start() \"file.txt\" 0\r\n11-20 18:29:07:881 0x5c60e20 OCC::OwncloudPropagator::localFileNameClash: CaseClashCheck for  \"C:/file.txt\"\r\n11-20 18:29:07:882 0x5c60e20 OCC::SyncJournalDb::setDownloadInfo: \"INSERT OR REPLACE INTO downloadinfo (path, tmpfile, etag, errorcount) VALUES ( ?1 , ?2, ?3, ?4 )\" \"file.txt\" \".file.txt.~19c8\" \"a3f470acdf0e51dc7c3d57e7d5316a7d\" 0\r\n11-20 18:29:07:882 0x5c60e20 OCC::SyncJournalDb::commitInternal: void OCC::SyncJournalDb::commitInternal(const QString&, bool) Transaction commit  \"download file start\" and starting new transaction\r\n11-20 18:29:07:883 0x5c60e20 OCC::GETFileJob::start: virtual void OCC::GETFileJob::start() OCC::BandwidthManager(0xd812c38) false false\r\n11-20 18:29:07:883 0x5c60e20 OCC::AbstractNetworkJob::start: !!! OCC::GETFileJob created for \"https://owncloudserver.com\" + \"/backup_dir/file.txt\"\r\n11-20 18:29:07:884 0x5c60e20 OCC::FolderWatcher::pathIsIgnored: * Discarded as is hidden! \"C:/backup_dir/.file.txt.~19c8\"\r\n\r\n11-20 18:29:08:089 0x5c60e20 OCC::PropagateDownloadFileQNAM::slotGetFinished: void OCC::PropagateDownloadFileQNAM::slotGetFinished()  QUrl( \"https://owncloudserver.com/remote.php/webdav/backup_dir/file.txt\" )  FINISHED WITH STATUS 0 \"\" 0 47616 47616 0 \"\" \"47616\"\r\n11-20 18:29:08:101 0x5c60e20 OCC::OwncloudPropagator::localFileNameClash: CaseClashCheck for  \"C:/file.txt\"\r\n11-20 18:29:08:104 0x5c60e20 OCC::PropagateDownloadFileQNAM::downloadFinished: Created conflict file \"C:/file.txt\" -> \"C:/file.txt_conflict-20151105-105352.txt\"\r\n11-20 18:29:08:139 0x5c60e20 OCC::SyncJournalFileRecord::SyncJournalFileRecord: OCC::SyncJournalFileRecord::SyncJournalFileRecord(const OCC::SyncFileItem&, const QString&) \"C:/file.txt\" Retrieved inode  229691 (previous item inode:  0 )\r\n11-20 18:29:08:139 0x5c60e20 OCC::SyncJournalDb::setFileRecord: \"INSERT OR REPLACE INTO metadata (phash, pathlen, path, inode, uid, gid, mode, modtime, type, md5, fileid, remotePerm, filesize, ignoredChildrenRemote) VALUES (?1 , ?2, ?3 , ?4 , ?5 , ?6 , ?7,  ?8 , ?9 , ?10, ?11, ?12, ?13, ?14);\" -9137562609134246323 29 \"file.txt\" 229691 0 \"1446717232\" \"0\" \"a3f470acdf0e51dc7c3d57e7d5316a7d\" \"00245604oc003a2ceea4\" \"RDNVW\" 47616 0\r\n11-20 18:29:08:140 0x5c60e20 OCC::SyncJournalDb::setDownloadInfo: \"DELETE FROM downloadinfo WHERE path=?1\" \"file.txt\"\r\n11-20 18:29:08:141 0x5c60e20 OCC::SyncJournalDb::commitInternal: void OCC::SyncJournalDb::commitInternal(const QString&, bool) Transaction commit  \"download file start2\" and starting new transaction\r\n11-20 18:29:08:141 0x5c60e20 OCC::SyncEngine::slotItemCompleted: void OCC::SyncEngine::slotItemCompleted(const OCC::SyncFileItem&, const OCC::PropagatorJob&) \"file.txt\" INSTRUCTION_CONFLICT 5 \"\"\r\n11-20 18:29:08:142 0x5c60e20 OCC::SocketApi::sendMessage: SocketApi:  Sending message:  \"STATUS:ERROR:C:\\file.txt\"\r\n11-20 18:29:08:145 0x5c60e20 OCC::FolderWatcher::pathIsIgnored: * Discarded by component ignore pattern  \".file.txt.~19c8\"\r\n11-20 18:29:08:149 0x5c60e20 OCC::FolderWatcher::changeDetected: detected changes in paths: QSet(\"C:/file.txt\")\r\n11-20 18:29:08:149 0x5c60e20 OCC::Folder::watcherSlot: void OCC::Folder::watcherSlot(QString) Sync running, IGNORE event for  \"C:/file.txt\"\r\n11-20 18:29:08:151 0x5c60e20 OCC::FolderWatcher::pathIsIgnored: * Discarded by component ignore pattern  \"file_conflict-20151105-105352.txt\"\r\n11-20 18:29:08:152 0x5c60e20 OCC::FolderWatcher::pathIsIgnored: * Discarded by component ignore pattern  \".file.txt.~19c8\"\r\n11-20 18:29:08:154 0x5c60e20 OCC::FolderWatcher::changeDetected: detected changes in paths: QSet(\"C:/file.txt\")\r\n11-20 18:29:08:155 0x5c60e20 OCC::Folder::watcherSlot: void OCC::Folder::watcherSlot(QString) Sync running, IGNORE event for  \"C:/file.txt\"\r\n```"},"comment":{"url":"https://api.github.com/repos/owncloud/client/issues/comments/164295851","html_url":"https://github.com/owncloud/client/issues/4173#issuecomment-164295851","issue_url":"https://api.github.com/repos/owncloud/client/issues/4173","id":164295851,"user":{"login":"stonerl","id":2091312,"avatar_url":"https://avatars.githubusercontent.com/u/2091312?v=3","gravatar_id":"","url":"https://api.github.com/users/stonerl","html_url":"https://github.com/stonerl","followers_url":"https://api.github.com/users/stonerl/followers","following_url":"https://api.github.com/users/stonerl/following{/other_user}","gists_url":"https://api.github.com/users/stonerl/gists{/gist_id}","starred_url":"https://api.github.com/users/stonerl/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/stonerl/subscriptions","organizations_url":"https://api.github.com/users/stonerl/orgs","repos_url":"https://api.github.com/users/stonerl/repos","events_url":"https://api.github.com/users/stonerl/events{/privacy}","received_events_url":"https://api.github.com/users/stonerl/received_events","type":"User","site_admin":false},"created_at":"2015-12-13T20:32:16Z","updated_at":"2015-12-13T20:32:16Z","body":"Well, it has not been replaced, the client just had to resolve a conflict: Old file from server, and newer/different file on the client with the same name. As far as I can recall, in such cases the server file wins and the local gets renamed to ``` _conflict*```.\r\n\r\nMaybe you were hitting a bug which prevented your client from syncing some files to the server and this one got resolved with the update.\r\n\r\nBtw. the latest client is 2.1.0"}}