Merge lp://qastaging/~vds/desktopcouch/deprecate_ensure_full_commit into lp://qastaging/desktopcouch
Proposed by
Chad Miller
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~vds/desktopcouch/deprecate_ensure_full_commit |
| Merge into: | lp://qastaging/desktopcouch |
| Diff against target: |
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) Text conflict in desktopcouch/application/migration/__init__.py Text conflict in desktopcouch/application/server.py Text conflict in desktopcouch/records/database.py Text conflict in desktopcouch/records/tests/test_server.py |
| To merge this branch: | bzr merge lp://qastaging/~vds/desktopcouch/deprecate_ensure_full_commit |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu One hackers | Pending | ||
|
Review via email:
|
|||
Commit message
Rename DesktopDatabase
To post a comment you must log in.
Revision history for this message
| Chad Miller (cmiller) wrote | # |
Unmerged revisions
- 223. By Vincenzo Di Somma
-
deprecated ensure_full_commit in favor of commit
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Good.