Merge lp://staging/~thumper/launchpad/recognize-branch-id-stacked-location into lp://staging/launchpad

Proposed by Tim Penhey
Status: Merged
Approved by: Tim Penhey
Approved revision: no longer in the source branch.
Merged at revision: 12758
Proposed branch: lp://staging/~thumper/launchpad/recognize-branch-id-stacked-location
Merge into: lp://staging/launchpad
Prerequisite: lp://staging/~thumper/launchpad/bzr-transport-branch-id-access
Diff against target: 73 lines (+28/-3)
2 files modified
lib/lp/code/model/branch.py (+16/-3)
lib/lp/code/model/tests/test_branch.py (+12/-0)
To merge this branch: bzr merge lp://staging/~thumper/launchpad/recognize-branch-id-stacked-location
Reviewer Review Type Date Requested Status
Graham Binns (community) code Approve
Review via email: mp+56289@code.staging.launchpad.net

Commit message

[r=gmb][bug=377519] Support stacking on /+branch-id/%(id)s to have the stacked on location robust on moves and renames.

Description of the change

The +branch-id stacking location needs to be understood
by the branchChanged method to set the database field
appropriately. We store this in the DB to show it on
the branch page, and to stop branches that are being
stacked on from being deleted.

To post a comment you must log in.
Revision history for this message
Graham Binns (gmb) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.