lp:~sil/u1db/yes-yes-picky-lgpl

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:u1db

Ubuntu One hackers: Pending requested 2011-12-22

Diff: 12 lines (+1/-1)

1 file modified

setup.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

160. By Stuart Langridge on 2011-12-22

Make the classifier right for LGPL

159. By Samuele Pedroni on 2011-12-22

switch to GNU LGPL v3 as intended

158. By Samuele Pedroni on 2011-12-21

tweaks around setup.py and integrated html-docs

157. By Stuart Langridge on 2011-12-21

merge html-docs branch

156. By Samuele Pedroni on 2011-12-20

use source_|target_ prefixes as appropriate more consistently for greater clarity

155. By Samuele Pedroni on 2011-12-16

keep other replica uids on Synchronizer and SyncExchange, avoids passing them around, cleanup

154. By John A Meinel on 2011-12-16

Combine the generation updates into put_doc_if_newer.

That way we have a single transaction to put the new document, handle conflicts,
and update the tracked last-revision of the remote replica.

153. By John A Meinel on 2011-12-16

Remove force_doc_sync_conflict, instead add put_doc_if_newer(save_conflict=True).

This simplifies the public api a bit, removing a function that only existed for sync.
It also gives us the right transaction boundaries during sync, so that we can have a
single transaction per document, instead of one determining that we had a conflict,
and then another one to insert the document as conflicted, etc.

152. By Samuele Pedroni on 2011-12-16

put_doc_if_newere and force_doc_conflict should supersede conflicts as appropriate; fixes #900313

151. By Samuele Pedroni on 2011-12-15

pep8 whitespace fix