_prune_conflicts should autoresolve-ish
Bug #1001338 reported by
John Lenton
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| U1DB |
Fix Released
|
Undecided
|
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
lp:~chipaca/u1db/prune-conflicts-automerges
- Samuele Pedroni: Needs Fixing
-
Diff: 444 lines (+299/-14)6 files modifiedsrc/u1db.c (+37/-2)
u1db/backends/__init__.py (+8/-2)
u1db/backends/inmemory.py (+10/-1)
u1db/backends/sqlite_backend.py (+12/-8)
u1db/tests/test_backends.py (+55/-1)
u1db/tests/test_sync.py (+177/-0)
| 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.
