← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/registry/stories/person/merge-people.txt

  • Committer: Stuart Bishop
  • Date: 2012-01-05 07:57:21 UTC
  • mfrom: (14635 devel)
  • mto: This revision was merged to the branch mainline in revision 14636.
  • Revision ID: stuart.bishop@canonical.com-20120105075721-ol7khggaclh7dgqj
Merged rocketfuel into db-deploy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/registry/stories/person/merge-people.txt
30
30
    >>> foo = PersonSet().getByName('foo')
31
31
    >>> email = EmailAddressSet().new(
32
32
    ...     'bar.foo@canonical.com', person=foo,
33
 
    ...     status=EmailAddressStatus.VALIDATED,
34
 
    ...     account=foo.account)
 
33
    ...     status=EmailAddressStatus.VALIDATED)
35
34
 
36
35
Then we find the duplicate account and request the merge.
37
36
This redirects to the page which displays all email addresses owned by the