lp:~chipaca/u1db/prune-conflicts-automerges

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:u1db

Samuele Pedroni: Needs Fixing on 2012-05-29

Diff: 444 lines (+299/-14)

6 files modified

src/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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1001338: _prune_conflicts should autoresolve-ish

Undecided

Fix Released

Link a bug report

Related blueprints

318. By John Lenton on 2012-05-31

added integration tests

317. By John Lenton on 2012-05-29

add explicit tests for the state returned by _put_doc_if_newer when automerging; add a sync test to test this autoresolving happening in the wild

316. By John Lenton on 2012-05-26

s/automerge/autoresolve/

315. By John Lenton on 2012-05-26

update the revno on automerge from _prune

314. By John Lenton on 2012-05-26

made _prune_conflicts prune conflicts if content is the same

313. By John Lenton on 2012-05-25

a first pass at resolve-doc for u1db-client

312. By Eric Casteleijn on 2012-05-25

made get_doc() and get_docs() not return deleted documents, and added an include_deleted argument in case one does want them

311. By John Lenton on 2012-05-25

Creating the same index twice is now not an error (as advertised).

310. By John Lenton on 2012-05-24

added get-doc-conflicts to u1db-client

309. By John Lenton on 2012-05-23

Split the «user globbed wrong» error from the «user used the wrong number of arguments» error when querying indexes (u1db-client gains better error reporting).