Branches
|
Size: 1109
Comment:
|
Size: 1537
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: |
| what a branch looks like | Branches related to a bug report appear beneath the bug's description. |
| Line 8: | Line 8: |
| Branches and their status related to a bug report appear beneath the bug's description. | {{attachment:bug-bzr-branch.png}} |
| Line 10: | Line 10: |
| ## image | 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 14: | Line 14: |
| == Linking to a related branch == |
|
| Line 16: | Line 18: |
| The merge proposal is actually performed outside of the bug report - when viewing the related branch. | {{attachment:bug-actions-portlet.png}} |
| Line 18: | Line 20: |
| ## image | == Propose for merging == |
| Line 20: | Line 22: |
| Click on "Propose for merging". | The merge proposal is actually performed outside of the bug report - when viewing the branch related to the bug report. |
| Line 22: | Line 24: |
| ## image | When viewing the relevant branch, click on "Propose for merging". |
| Line 24: | Line 26: |
| 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'. | {{attachment: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'. |
| Line 32: | Line 36: |
| removing an erroneous branch | ## removing an erroneous 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.
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
Linking to a related branch
It is possible to add a branch to a bug report by clicking on "Link a related branch" in the actions portlet.
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".
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)