haiwen / seafile-client

Seafile desktop client.
http://seafile.com
Apache License 2.0
459 stars 280 forks source link

Resolve conflicts with an identical file automatically #860

Open allo- opened 7 years ago

allo- commented 7 years ago

My seafile client found when syncing after some offline time a lot of conflicts and created "SFConflict" files. When sorting with a deduplication tool (fdupes), all of the conflicts were files with the same content. Why aren't such conflicts resolved automatically, when the file content is the same?

killing commented 7 years ago

Hi,

Are the conflicted files uploaded somewhere else and you also add these files on your computer? Where did you upload these file from? A phone? Or from web?

allo- commented 7 years ago

They were originally photo uploads, which were synced to my desktop. My desktop client could not connect for a while and when i stopped it and started it again, it synced some files, including some photo uploads, which caused the conflicts. I suspected that the old copy may actually be incomplete and used fdupes for removing only the duplicate files. This found, that the "SFConflict" files were identical copies (which i then just deleted and i think things are now correctly synced at all devices). So possibly some metadata was not updated correctly when the files were synced the second time.

killing commented 7 years ago

This is a known situation. The hash value for files uploaded from mobile and web clients are different the hash value generated on desktop client. We'll try to fix this case.

rumplstielz commented 2 years ago

still not fixed, unfortunately