diff options
| author | chron@google.com <chron@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 21:39:12 +0000 |
|---|---|---|
| committer | chron@google.com <chron@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 21:39:12 +0000 |
| commit | 8938e4e53180b3892d5e853578d5333070c40cb2 (patch) | |
| tree | 4b032712ea535d7fd8a78a6fa791bfbbb3dbe617 /chrome/browser/sync/engine/process_updates_command.cc | |
| parent | e77cda08c5c8647ed457ccaebf2eaa58eab8fca2 (diff) | |
| download | chromium_src-8938e4e53180b3892d5e853578d5333070c40cb2.zip chromium_src-8938e4e53180b3892d5e853578d5333070c40cb2.tar.gz chromium_src-8938e4e53180b3892d5e853578d5333070c40cb2.tar.bz2 | |
Fix some minor things that were in the unique naming CL that I forgot to address.
Review URL: http://codereview.chromium.org/435026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33127 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/engine/process_updates_command.cc')
| -rwxr-xr-x | chrome/browser/sync/engine/process_updates_command.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/sync/engine/process_updates_command.cc b/chrome/browser/sync/engine/process_updates_command.cc index cb98368..0f89442 100755 --- a/chrome/browser/sync/engine/process_updates_command.cc +++ b/chrome/browser/sync/engine/process_updates_command.cc @@ -160,8 +160,10 @@ ServerUpdateProcessingResult ProcessUpdatesCommand::ProcessUpdate( if (update_entry.Get(SERVER_VERSION) == update_entry.Get(BASE_VERSION) && !update_entry.Get(IS_UNSYNCED)) { - // Previously this was a big issue but at this point we don't really care - // that much if things don't match up exactly. + // It's largely OK if data doesn't match exactly since a future update + // will just clobber the data. Conflict resolution will overwrite and + // take one side as the winner and does not try to merge, so strict + // equality isn't necessary. LOG_IF(ERROR, !SyncerUtil::ServerAndLocalEntriesMatch(&update_entry)) << update_entry; } |