Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(271)

Issue 149683008: [SyncFS] Don't re-run conflict resolution on resolution error (Closed)

Created:
6 years, 10 months ago by tzik
Modified:
6 years, 10 months ago
Reviewers:
kinuko, nhiroki
CC:
chromium-reviews, kinuko+watch, nhiroki
Visibility:
Public.

Description

[SyncFS] Don't re-run conflict resolution on resolution error BUG=339327 R=kinuko@chromium.org, nhiroki@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=247877

Patch Set 1 #

Total comments: 2
Unified diffs Side-by-side diffs Delta from patch set Stats (+3 lines, -2 lines) Patch
M chrome/browser/sync_file_system/drive_backend/sync_engine.cc View 2 chunks +3 lines, -2 lines 2 comments Download

Messages

Total messages: 7 (0 generated)
tzik
PTL
6 years, 10 months ago (2014-01-30 04:05:38 UTC) #1
nhiroki
lgtm https://codereview.chromium.org/149683008/diff/1/chrome/browser/sync_file_system/drive_backend/sync_engine.cc File chrome/browser/sync_file_system/drive_backend/sync_engine.cc (right): https://codereview.chromium.org/149683008/diff/1/chrome/browser/sync_file_system/drive_backend/sync_engine.cc#newcode593 chrome/browser/sync_file_system/drive_backend/sync_engine.cc:593: void SyncEngine::DidResolveConflict(SyncStatusCode status) { How about having "DCHECK(!should_check_conflict_);" ...
6 years, 10 months ago (2014-01-30 04:24:35 UTC) #2
kinuko
lgtm
6 years, 10 months ago (2014-01-30 04:46:24 UTC) #3
nhiroki
https://codereview.chromium.org/149683008/diff/1/chrome/browser/sync_file_system/drive_backend/sync_engine.cc File chrome/browser/sync_file_system/drive_backend/sync_engine.cc (right): https://codereview.chromium.org/149683008/diff/1/chrome/browser/sync_file_system/drive_backend/sync_engine.cc#newcode593 chrome/browser/sync_file_system/drive_backend/sync_engine.cc:593: void SyncEngine::DidResolveConflict(SyncStatusCode status) { On 2014/01/30 04:24:35, nhiroki wrote: ...
6 years, 10 months ago (2014-01-30 04:53:27 UTC) #4
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/tzik@chromium.org/149683008/1
6 years, 10 months ago (2014-01-30 04:56:45 UTC) #5
commit-bot: I haz the power
Retried try job too often on android_dbg for step(s) slave_steps http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_dbg&number=144561
6 years, 10 months ago (2014-01-30 06:47:08 UTC) #6
tzik
6 years, 10 months ago (2014-01-30 07:40:53 UTC) #7
Message was sent while issue was closed.
Committed patchset #1 manually as r247877 (presubmit successful).

Powered by Google App Engine
This is Rietveld 408576698