CmisSync
CmisSync copied to clipboard
Conflict not detected when same file created on both sides
Hi, I have some trouble with "lastDatabaseUpdate" in CmisSync.Lib/Sync/CrawlStrategy.cs The date/time of lastDatabaseUpdate is not the real date/time when same file created on both sides.
For exemple, my Logs: 2016-07-21 17:12:57,715 [1] INFO CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - - serverSideModificationDate: 21/07/2016 15:12:11 2016-07-21 17:12:57,715 [1] INFO CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - - lastDatabaseUpdate: 21/07/2016 15:00:56
######################## Update 1 ##################### 2016-07-21 17:12:06,116 [1] INFO CmisSync.Lib.RepoBase [(null)] - Repo testsSynchro - Set poll interval to 3600000ms 2016-07-21 17:12:06,139 [1] INFO CmisSync.Lib.Sync.CmisRepo [(null)] - CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder 2016-07-21 17:12:06,144 [1] INFO CmisSync.Lib.RepoBase [(null)] - Full Sync Started: \vmsiege124\espacepro_synchro$\testsSynchro 2016-07-21 17:12:07,104 [1] INFO CmisSync.Auth.Auth [(null)] - VendorName: Alfresco 2016-07-21 17:12:07,104 [1] INFO CmisSync.Auth.Auth [(null)] - ProductName: Alfresco Community 2016-07-21 17:12:07,104 [1] INFO CmisSync.Auth.Auth [(null)] - ProductVersion: 4.2.0 (r63893-b12) 2016-07-21 17:12:07,104 [1] INFO CmisSync.Auth.Auth [(null)] - CmisVersionSupported: 1.1 2016-07-21 17:12:07,104 [1] INFO CmisSync.Auth.Auth [(null)] - Name: 2016-07-21 17:12:07,104 [1] INFO CmisSync.Auth.Auth [(null)] - Description: 2016-07-21 17:12:07,104 [1] DEBUG CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - Created CMIS session: DotCMIS.Client.Impl.Session 2016-07-21 17:12:07,105 [1] DEBUG CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - ChangeLog capability: True 2016-07-21 17:12:07,105 [1] DEBUG CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - Get folder tree support: True 2016-07-21 17:12:07,105 [1] DEBUG CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - Get descendants support: True 2016-07-21 17:12:07,105 [1] DEBUG CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - Chunked Up/Download disabled 2016-07-21 17:12:07,641 [1] DEBUG CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - First sync, invoke a full crawl sync 2016-07-21 17:12:08,040 [1] DEBUG CmisSync.Lib.Cmis.CmisUtils [(null)] - Server token:162300 2016-07-21 17:12:10,563 [1] INFO CmisSync.Lib.Database.Database [(null)] - Checking whether database C:\Users\gavet_ma\AppData\Roaming\cmissync\testsSynchro.cmissync exists 2016-07-21 17:12:10,613 [1] INFO CmisSync.Lib.Database.DatabaseMigration [(null)] - Checking whether database C:\Users\gavet_ma\AppData\Roaming\cmissync\testsSynchro.cmissync exists 2016-07-21 17:12:10,649 [1] DEBUG CmisSync.Lib.SyncItem [(null)] - File.Exists(\vmsiege124\espacepro_synchro$\testsSynchro_testVersion.txt) = True 2016-07-21 17:12:10,674 [1] INFO CmisSync.Lib.Database.Database [(null)] - Checksum of \vmsiege124\espacepro_synchro$\testsSynchro_testVersion.txt has changed from C14E3DDE339A29A416ACE2E144201E8A61988686 to 24D6A942A30E3A7FA12CF8BC698B88D02B37CB23 2016-07-21 17:12:10,674 [1] INFO CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - Uploading file update on repository: \vmsiege124\espacepro_synchro$\testsSynchro_testVersion.txt 2016-07-21 17:12:10,996 [1] INFO CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - Updating: \vmsiege124\espacepro_synchro$\testsSynchro_testVersion.txt 2016-07-21 17:12:11,327 [1] DEBUG CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - before SetContentStream 2016-07-21 17:12:12,202 [1] DEBUG CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - after SetContentStream 2016-07-21 17:12:12,517 [1] INFO CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - Updated: \vmsiege124\espacepro_synchro$\testsSynchro_testVersion.txt 2016-07-21 17:12:12,523 [1] INFO CmisSync.Lib.Database.Database [(null)] - Database ChangeLog token set to: 162300 2016-07-21 17:12:12,531 [1] INFO CmisSync.Lib.RepoBase [(null)] - Full Sync Complete: \vmsiege124\espacepro_synchro$\testsSynchro
######################## Update 2 ##################### 2016-07-21 17:12:52,773 [1] INFO CmisSync.Lib.RepoBase [(null)] - Repo testsSynchro - Set poll interval to 3600000ms 2016-07-21 17:12:52,795 [1] INFO CmisSync.Lib.Sync.CmisRepo [(null)] - CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder 2016-07-21 17:12:52,799 [1] INFO CmisSync.Lib.RepoBase [(null)] - Full Sync Started: \vmsiege124\espacepro_synchro$\testsSynchro 2016-07-21 17:12:54,124 [1] INFO CmisSync.Auth.Auth [(null)] - VendorName: Alfresco 2016-07-21 17:12:54,125 [1] INFO CmisSync.Auth.Auth [(null)] - ProductName: Alfresco Community 2016-07-21 17:12:54,125 [1] INFO CmisSync.Auth.Auth [(null)] - ProductVersion: 4.2.0 (r63893-b12) 2016-07-21 17:12:54,125 [1] INFO CmisSync.Auth.Auth [(null)] - CmisVersionSupported: 1.1 2016-07-21 17:12:54,125 [1] INFO CmisSync.Auth.Auth [(null)] - Name: 2016-07-21 17:12:54,125 [1] INFO CmisSync.Auth.Auth [(null)] - Description: 2016-07-21 17:12:54,125 [1] DEBUG CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - Created CMIS session: DotCMIS.Client.Impl.Session 2016-07-21 17:12:54,126 [1] DEBUG CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - ChangeLog capability: True 2016-07-21 17:12:54,126 [1] DEBUG CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - Get folder tree support: True 2016-07-21 17:12:54,126 [1] DEBUG CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - Get descendants support: True 2016-07-21 17:12:54,126 [1] DEBUG CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - Chunked Up/Download disabled 2016-07-21 17:12:54,686 [1] DEBUG CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - First sync, invoke a full crawl sync 2016-07-21 17:12:54,934 [1] DEBUG CmisSync.Lib.Cmis.CmisUtils [(null)] - Server token:162346 2016-07-21 17:12:57,600 [1] INFO CmisSync.Lib.Database.Database [(null)] - Checking whether database C:\Users\gavet_ma\AppData\Roaming\cmissync\testsSynchro.cmissync exists 2016-07-21 17:12:57,648 [1] INFO CmisSync.Lib.Database.DatabaseMigration [(null)] - Checking whether database C:\Users\gavet_ma\AppData\Roaming\cmissync\testsSynchro.cmissync exists 2016-07-21 17:12:57,685 [1] DEBUG CmisSync.Lib.SyncItem [(null)] - File.Exists(\vmsiege124\espacepro_synchro$\testsSynchro_testVersion.txt) = True 2016-07-21 17:12:57,705 [1] INFO CmisSync.Lib.Database.Database [(null)] - Checksum of \vmsiege124\espacepro_synchro$\testsSynchro_testVersion.txt has changed from 24D6A942A30E3A7FA12CF8BC698B88D02B37CB23 to E2FE64CBCB54C896EA8367D1D7EF16D02076E6C4 2016-07-21 17:12:57,705 [1] INFO CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - Conflict with file: _testVersion.txt, backing up locally modified version and downloading server version 2016-07-21 17:12:57,715 [1] INFO CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - - serverSideModificationDate: 21/07/2016 15:12:11 2016-07-21 17:12:57,715 [1] INFO CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - - lastDatabaseUpdate: 21/07/2016 15:00:56 2016-07-21 17:12:57,716 [1] INFO CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - - Checksum in database: 24D6A942A30E3A7FA12CF8BC698B88D02B37CB23 2016-07-21 17:12:57,721 [1] INFO CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - - Checksum of local file: E2FE64CBCB54C896EA8367D1D7EF16D02076E6C4 2016-07-21 17:12:57,750 [1] INFO CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - Downloading: _testVersion.txt 2016-07-21 17:12:57,973 [1] INFO CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - Downloaded remote object(8acd8483-bcb4-465d-8f13-03f62bc52e2b;1.0): _testVersion.txt 2016-07-21 17:12:57,979 [1] DEBUG CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - Renaming temporary local download file \vmsiege124\espacepro_synchro$\testsSynchro_testVersion.txt.sync to \vmsiege124\espacepro_synchro$\testsSynchro_testVersion.txt 2016-07-21 17:12:58,023 [1] DEBUG CmisSync.Lib.Database.Database [(null)] - Starting database file addition for file: \vmsiege124\espacepro_synchro$\testsSynchro_testVersion.txt 2016-07-21 17:12:58,143 [1] DEBUG CmisSync.Lib.Database.Database [(null)] - Completed database file addition for file: \vmsiege124\espacepro_synchro$\testsSynchro_testVersion.txt 2016-07-21 17:12:58,143 [1] INFO CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - Added file to database: \vmsiege124\espacepro_synchro$\testsSynchro_testVersion.txt 2016-07-21 17:12:58,153 [1] INFO CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - - Checksum of remote file: 24D6A942A30E3A7FA12CF8BC698B88D02B37CB23 2016-07-21 17:12:58,154 [1] INFO CmisSync.Lib.Sync.CmisRepo+SynchronizedFolder [(null)] - User gavet_ma modified file "\vmsiege124\espacepro_synchro$\testsSynchro_testVersion.txt" at the same time as you.
Your version has been saved as "\vmsiege124\espacepro_synchro$\testsSynchro_testVersion_gavet_ma-conflict-version.txt", please merge your important changes from it and then delete it. 2016-07-21 17:12:58,181 [1] DEBUG CmisSync.Lib.Utils [(null)] - Skipping _testversion_gavet_ma-conflict-version.txt: ignored file 2016-07-21 17:12:58,186 [1] INFO CmisSync.Lib.Database.Database [(null)] - Database ChangeLog token set to: 162346 2016-07-21 17:12:58,192 [1] INFO CmisSync.Lib.RepoBase [(null)] - Full Sync Complete: \vmsiege124\espacepro_synchro$\testsSynchro
@mathieuga : Could you please create a new issue, as it does not seem to be related to "Conflict not detected when same file created on both sides". Thanks!
New issue created and solved (https://github.com/aegif/CmisSync/issues/714)