Branches

Differences between revisions 5 and 6
Revision 5 as of 2010-03-09 22:18:56
Size: 1537
Editor: c-24-21-43-9
Comment:
Revision 6 as of 2010-03-09 22:34:52
Size: 2466
Editor: c-24-21-43-9
Comment:
Deletions are marked like this. Additions are marked like this.
Line 22: Line 22:
The merge proposal is actually performed outside of the bug report - when viewing the branch related to the bug report. Not everyone is aware of the need for creating a merge proposal so you may find bugs with branches without merge proposals. The merge proposal is actually performed outside of the bug report - when viewing the branch related to the bug report.
Line 28: Line 28:
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'. 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 defaults to 'ubuntu-branches' you'll want to change it to 'ubuntu-core-dev'.
Line 30: Line 30:
## image == Changing the reviewer ==
Line 32: Line 32:
## changing an existing merge request - check with james_w about this In the event that merge proposal has the reveiwer set incorrectly if you are the branch owner you can change the reviewer. This is done by clicking on the pencil next to the current reviewer. Most Ubuntu merge proposals should have the revier set to 'ubuntu-core-dev' or 'ubuntu-dev'.
Line 34: Line 34:
## Click on the related bzr branch, add a new merge proposal with Because only the branch owner can do this we need to ask them to perform this work. A possible reply:
Line 36: Line 36:
## removing an erroneous branch ||<tablestyle="background-color: #eee"> Thanks for working on fixing this bug - this is fantastic! Unfortunately, your merge proposal currently lists 'ubuntu-branches' as the reviewer. For it to be dealt with in a prompt fashion could you please change the reviewer to 'ubuntu-dev'. Thanks in advance! ||

== Unlinking a branch from a bug ==

In the odd event that you find a branch that is totally unrelated to a bug linked with it feel free to remove the relationship. You can do this by clicking on the '''-''' red circle next to the related branch.

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

Not everyone is aware of the need for creating a merge proposal so you may find bugs with branches without merge proposals. 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 defaults to 'ubuntu-branches' you'll want to change it to 'ubuntu-core-dev'.

Changing the reviewer

In the event that merge proposal has the reveiwer set incorrectly if you are the branch owner you can change the reviewer. This is done by clicking on the pencil next to the current reviewer. Most Ubuntu merge proposals should have the revier set to 'ubuntu-core-dev' or 'ubuntu-dev'.

Because only the branch owner can do this we need to ask them to perform this work. A possible reply:

Thanks for working on fixing this bug - this is fantastic! Unfortunately, your merge proposal currently lists 'ubuntu-branches' as the reviewer. For it to be dealt with in a prompt fashion could you please change the reviewer to 'ubuntu-dev'. Thanks in advance!

Unlinking a branch from a bug

In the odd event that you find a branch that is totally unrelated to a bug linked with it feel free to remove the relationship. You can do this by clicking on the - red circle next to the related branch.

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