tree 3bfbc12e0d0236a4f146a089baadc607d48dcac5
parent 4409172a3151f6ef1ae1a010075892f35edf0c64
author Himabindu Pucha <hpucha@google.com> 1438098588 -0700
committer Himabindu Pucha <hpucha@google.com> 1438098594 -0700

syncbase/vsync:
Bug fixes for handling cases with conflicting updates.
Added an integration test to go with it.

Issues:
* Contention between initiator and watcher when receiving deltas.
* hasConflict when retried didn't correctly capture the change in DAG head.
* Link log records were not created where needed.
* When sync was stale compared to store, the retry error was not correctly handled.

Change-Id: I6fa1f13cd5aabb8290e6e2631ea8458b55bbfe7f