_prune_conflicts should autoresolve-ish

Bug #1001338 reported by John Lenton on 2012-05-18
This bug affects 1 person
Affects Status Importance Assigned to Milestone
John Lenton

Bug Description

_prune_conflicts should handle the case where the conflicted document content is the same as the new document's content, and autoresolve (a2+a1b1 syncs with a3 where a3.content == a1b1.content => a4b2 or something).

Related branches

John Lenton (chipaca) on 2012-05-26
Changed in u1db:
status: New → In Progress
assignee: nobody → John Lenton (chipaca)
Changed in u1db:
status: In Progress → Fix Committed
Changed in u1db:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers