Branches

Differences between revisions 2 and 4 (spanning 2 versions)
Revision 2 as of 2010-03-09 00:24:46
Size: 1140
Editor: c-24-21-43-9
Comment:
Revision 4 as of 2010-03-09 00:36:57
Size: 1554
Editor: c-24-21-43-9
Comment:
Deletions are marked like this. Additions are marked like this.
Line 10: Line 10:
Here we can see that arky's branch, fix-487779, is proposed for merging in to the developement release of the Ubuntu package refpolicy-ubuntu. The reviewer is Ubuntu branches and the review is pending.
Line 11: Line 13:

== Linking to a related branch ==
Line 14: Line 18:
The merge proposal is actually performed outside of the bug report - when viewing the related branch. {{attachment:bug-actions-portlet.png}}
Line 16: Line 20:
## image The merge proposal is actually performed outside of the bug report - when viewing the branch related to the bug report.
Line 18: Line 22:
Click on "Propose for merging". == Propose for merging ==

When viewing the relevant branch, click on "Propose for merging".
Line 22: Line 28:
The target branch should be the bzr branch for the development version of the package. In the "Extra options it is possible to specify a reviewer - if it is set to 'ubuntu-branches' you'll want to change it to 'ubuntu-core-dev'. The target branch should be the bzr branch for the development version of the package - notice the "development focus" text in the screenshot. In the "Extra options" it is possible to specify a reviewer - if it is set to 'ubuntu-branches' you'll want to change it to 'ubuntu-core-dev'.
Line 30: Line 36:
removing an erroneous branch ## removing an erroneous branch

Work In Progress

Fixes for a bug report can appear either as patches or a bzr branches. Bzr branches are preferred over patches as it is possible comment on the branch in a merge proposal and diffs can appear in-line in the bug report.

Branches and their status related to a bug report appear beneath the bug's description.

bug-bzr-branch.png

Here we can see that arky's branch, fix-487779, is proposed for merging in to the developement release of the Ubuntu package refpolicy-ubuntu. The reviewer is Ubuntu branches and the review is pending.

Workflow

It is possible to add a branch to a bug report by clicking on "Link a related branch" in the actions portlet.

bug-actions-portlet.png

The merge proposal is actually performed outside of the bug report - when viewing the branch related to the bug report.

Propose for merging

When viewing the relevant branch, click on "Propose for merging".

branch-merge-proposal.png

The target branch should be the bzr branch for the development version of the package - notice the "development focus" text in the screenshot. In the "Extra options" it is possible to specify a reviewer - if it is set to 'ubuntu-branches' you'll want to change it to 'ubuntu-core-dev'.

Bugs/Branches (last edited 2010-03-10 17:18:43 by c-24-21-43-9)