| Index: chrome/browser/sync/engine/conflict_resolver.cc
|
| diff --git a/chrome/browser/sync/engine/conflict_resolver.cc b/chrome/browser/sync/engine/conflict_resolver.cc
|
| index a59facafe06772be8e4706b9e031c47c99d076d3..469d6829683fda730a80f0096769130fe3665c54 100644
|
| --- a/chrome/browser/sync/engine/conflict_resolver.cc
|
| +++ b/chrome/browser/sync/engine/conflict_resolver.cc
|
| @@ -531,11 +531,12 @@ bool AttemptToFixUpdateEntryInDeletedLocalTree(WriteTransaction* trans,
|
| id = parent.Get(syncable::PARENT_ID);
|
| }
|
| // If we find we've been looping we re-root the hierarchy.
|
| - if (loop_detection < 0)
|
| + if (loop_detection < 0) {
|
| if (id == entry.Get(syncable::ID))
|
| reroot_id = entry.Get(syncable::PARENT_ID);
|
| else
|
| reroot_id = id;
|
| + }
|
| // Now we fix things up by undeleting all the folders in the item's path.
|
| id = parent_id;
|
| while (!id.IsRoot() && id != reroot_id) {
|
|
|