diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-12 21:18:46 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-12 21:18:46 +0000 |
| commit | f2c35caaa0318dbe21582e84420eb6d8ed01910b (patch) | |
| tree | 92a353df7dcbad1d78f687333a651cbe46dbade3 /chrome/browser/chromeos/drive/drive_file_system_interface.h | |
| parent | f783c3de47ebccdcaeddb64aff2b59c92eb32286 (diff) | |
| download | chromium_src-f2c35caaa0318dbe21582e84420eb6d8ed01910b.zip chromium_src-f2c35caaa0318dbe21582e84420eb6d8ed01910b.tar.gz chromium_src-f2c35caaa0318dbe21582e84420eb6d8ed01910b.tar.bz2 | |
SyncFS: Implement auto conflict resolution for last-write-win
For remote sync:
- Mark the entry conflicted if conflict resolution policy is MANUAL
- Otherwise:
* if the remote change doesn't have updated_time, fetch remote metadata
* LOCAL WIN case: call ResolveConflictToLocal() to add fake local change.
* REMOTE WIN case: clear conflicted flag and start over the remote sync
w/o any local changes.
For local sync:
- Mark the entry conflicted if conflict resolution policy is MANUAL
- Otherwise:
* fetch remote metadata
* LOCAL WIN case: clear conflicted flag, remove the remote changes and
start over the local sync.
* REMOTE WIN case: call ResolveConflictToRemote() to flip to_be_fetched flag.
BUG=177159
TEST=manual (tested with --enable-syncfs-last-write-win flag)
Review URL: https://chromiumcodereview.appspot.com/12614005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187648 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/drive/drive_file_system_interface.h')
0 files changed, 0 insertions, 0 deletions