Branches

Differences between revisions 1 and 2
Revision 1 as of 2010-03-09 00:02:48
Size: 1109
Editor: c-24-21-43-9
Comment:
Revision 2 as of 2010-03-09 00:24:46
Size: 1140
Editor: c-24-21-43-9
Comment:
Deletions are marked like this. Additions are marked like this.
Line 6: Line 6:
what a branch looks like
Line 10: Line 8:
## image {{attachment:bug-bzr-branch.png}}
Line 22: Line 20:
## image {{attachment:branch-merge-proposal.png}}
Line 24: Line 22:
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. 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'.

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

Workflow

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

The merge proposal is actually performed outside of the bug report - when viewing the related 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. 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'.

removing an erroneous branch

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