lp://qastaging/~vds/desktopcouch/deprecate_ensure_full_commit

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://qastaging/desktopcouch

Ubuntu One hackers: Pending requested 2010-11-26

Diff: 792 lines (+406/-49) (has conflicts)

13 files modified

desktopcouch/application/migration/__init__.py (+21/-1)
desktopcouch/application/server.py (+28/-2)
desktopcouch/bookmarks/__init__.py (+0/-1)
desktopcouch/bookmarks/record.py (+0/-9)
desktopcouch/notes/__init__.py (+0/-1)
desktopcouch/notes/record.py (+0/-9)
desktopcouch/records/database.py (+70/-10)
desktopcouch/records/http.py (+269/-0)
desktopcouch/records/tests/test_server.py (+11/-3)
desktopcouch/recordtypes/contacts/testing/create.py (+6/-2)
desktopcouch/tasks/__init__.py (+0/-1)
desktopcouch/tasks/record.py (+0/-9)
utilities/lint.sh (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

223. By Vincenzo Di Somma on 2010-11-25

deprecated ensure_full_commit in favor of commit

222. By Vincenzo Di Somma on 2010-11-23

again conflicts, again fixed

221. By Vincenzo Di Somma on 2010-11-23

I shouldn't have removed that

220. By Vincenzo Di Somma on 2010-11-23

I shouldn't have removed that

219. By Vincenzo Di Somma on 2010-11-23

making pylint happy as much as possible

218. By Vincenzo Di Somma on 2010-11-23

merged with trunk

217. By Vincenzo Di Somma on 2010-11-18

fixing and linting and de-deprecating

216. By Vincenzo Di Somma on 2010-11-18

fixing and linting

215. By Vincenzo Di Somma on 2010-11-18

ok, I forgot to add http.py and finally I fixed the conflicts with trunk

214. By Vincenzo Di Somma on 2010-11-18

pushing to show the error