sickill/bitpocket — Issue #8: Conflicting Changes Detection
Author: unveiled
Created: 2012-01-03 19:52:52+00:00
State: open

I haven't tested every permutation of possible conflicts. But my first basic test failed:

1. Create Master with single file as contents: "testing".
2. Sync slave1 with Master.
3. Delete file from Master (or delete from slave2 and then sync slave2 with Master)
4. Modify file on slave1.
5. Sync slave1 with Master.

The file that was just modified (and modified after it was deleted on the Master) on slave1 is removed. Deletion takes precedence over any other changes to the file regardless of the timing of those changes.

Proposed solution: keep a timestamp from last successful sync in the .bitpocket directory and use that plus the time modified of the files to prevent deleting modified files, or at least throw up a question.