Merge lp://qastaging/~vds/desktopcouch/fieldmapping_fixes into lp://qastaging/desktopcouch
Proposed by
Vincenzo Di Somma
| Status: | Merged |
|---|---|
| Approved by: | Vincenzo Di Somma |
| Approved revision: | 145 |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~vds/desktopcouch/fieldmapping_fixes |
| Merge into: | lp://qastaging/desktopcouch |
| Diff against target: |
48 lines (+16/-4) 2 files modified
desktopcouch/records/field_registry.py (+2/-3) desktopcouch/records/tests/test_field_registry.py (+14/-1) |
| To merge this branch: | bzr merge lp://qastaging/~vds/desktopcouch/fieldmapping_fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chad Miller (community) | Approve | ||
| Eric Casteleijn (community) | Approve | ||
| Martin Albisetti (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Making desktopcouch more robusts when dealing with mergeable lists.
If a key is still in private application annotation for a certain application but it has been removed from it's root_list the mergeable list code traces back with a key error.
Description of the change
Making desktopcouch more robusts when dealing with mergeable lists.
To post a comment you must log in.
Revision history for this message
| Martin Albisetti (beuno) | # |
review:
Approve
Revision history for this message
| Chad Miller (cmiller) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good, tests pass. Thanks for fixing this!