Branches

Differences between revisions 4 and 5
Revision 4 as of 2010-03-09 00:36:57
Size: 1554
Editor: c-24-21-43-9
Comment:
Revision 5 as of 2010-03-09 22:18:56
Size: 1537
Editor: c-24-21-43-9
Comment:
Deletions are marked like this. Additions are marked like this.
Line 4: Line 4:
Fixes for a bug report can appear either as [[ Bugs/Patches | 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. Fixes for a bug report can appear either as [[ Bugs/Patches | patches ]] or branches. 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.
Line 6: Line 6:
Branches and their status related to a bug report appear beneath the bug's description. Branches related to a bug report appear beneath the bug's description.
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. 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 currently pending.
Line 20: Line 20:
== Propose for merging ==
Line 21: Line 23:

== Propose for merging ==

Work In Progress

Fixes for a bug report can appear either as patches or branches. 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 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 currently 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

Propose for merging

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

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)