lp://staging/~thisfred/u1db/remove-local-gen-before-sync

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://staging/u1db

Samuele Pedroni: Disapprove on 2012-08-15

dobey (community): Needs Fixing on 2012-08-15

Diff: 164 lines (+18/-23)

5 files modified

include/u1db/u1db_internal.h (+1/-2)
src/u1db.c (+1/-1)
src/u1db_sync_target.c (+5/-5)
u1db/tests/c_backend_wrapper.pyx (+3/-5)
u1db/tests/test_sync.py (+8/-10)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

380. By Eric Casteleijn on 2012-08-15

fixed leftover call:

379. By Eric Casteleijn on 2012-08-15

remerged trunk:

378. By Eric Casteleijn on 2012-08-14

removed unused parameter

377. By Eric Casteleijn on 2012-08-14

Removed simplejson as a hard dependency. It will still be used if present.

376. By Eric Casteleijn on 2012-08-14

Used colored squares rather than row background colors for tag indicators.

375. By Eric Casteleijn on 2012-08-13

Fixed error when adding new tasks

374. By Eric Casteleijn on 2012-08-13

added subscription needed exception

373. By Eric Casteleijn on 2012-08-13

- added UI for conflict resolution

372. By Eric Casteleijn on 2012-08-13

- refactored the way sql queries are built in the python backend, and brought it more into step with the C implementation.
- made get_all_docs, get_from_index and get_range_from_index conflict aware

371. By Eric Casteleijn on 2012-08-06

Added background synchronisation to cosas.