Merge lp:~cjwatson/launchpad/livefs-personmerge into lp:launchpad
Proposed by
Colin Watson
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | William Grant | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 17058 | ||||
Proposed branch: | lp:~cjwatson/launchpad/livefs-personmerge | ||||
Merge into: | lp:launchpad | ||||
Prerequisite: | lp:~cjwatson/launchpad/livefs | ||||
Diff against target: |
182 lines (+82/-5) 5 files modified
lib/lp/registry/personmerge.py (+23/-4) lib/lp/registry/tests/test_personmerge.py (+39/-1) lib/lp/soyuz/interfaces/livefs.py (+3/-0) lib/lp/soyuz/model/livefs.py (+4/-0) lib/lp/soyuz/tests/test_livefs.py (+13/-0) |
||||
To merge this branch: | bzr merge lp:~cjwatson/launchpad/livefs-personmerge | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
William Grant | code | Approve | |
Review via email:
|
Commit message
Handle LiveFS.owner during person merging.
Description of the change
Handle LiveFS.owner during person merging. This reverts the temporary hack from https:/
The main thing I was unsure about here was the manual flush I had to do at the end of _mergeLiveFS. It makes sense that I should have to flush database updates, given that merge_people calls store.invalidate() not long afterwards, and my tests failed when I didn't do that; but how come _mergeSourcePac
To post a comment you must log in.