Merge lp://qastaging/~cmiller/desktopcouch/replication-exclusion-and-complex-data-structure into lp://qastaging/desktopcouch
Proposed by
Chad Miller
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Facundo Batista | ||||
| Approved revision: | 154 | ||||
| Merged at revision: | not available | ||||
| Proposed branch: | lp://qastaging/~cmiller/desktopcouch/replication-exclusion-and-complex-data-structure | ||||
| Merge into: | lp://qastaging/desktopcouch | ||||
| Diff against target: |
70 lines (+19/-2) 2 files modified
desktopcouch/pair/couchdb_pairing/couchdb_io.py (+4/-1) desktopcouch/pair/tests/test_couchdb_io.py (+15/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~cmiller/desktopcouch/replication-exclusion-and-complex-data-structure | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Facundo Batista (community) | Approve | ||
| Stuart Colville (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Detect when we're trying to pluck values out of a MergableList and return those values instead.
The upshot is that this fixes a bug with replication exclusion. The code previously looked only for a list, but the new excluder API doesn't make those. (LP: #563901)
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Test pass, looks good.