launchpad help|
Size: 860
Comment:
|
← Revision 9 as of 2009-03-16 13:12:32 ⇥
Size: 2562
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 1: | Line 1: |
| If you host or mirror Bazaar branches on Launchpad, and you plan to merge code from one branch into another, you can tell other Launchpad users by registering a branch merge proposal. | ||<tablestyle="float:right; font-size: 0.9em; width:40%; background:#F1F1ED; margin: 0 0 1em 1em;" style="padding:0.5em;"><<TableOfContents>>|| = Overview = One of the great things about Launchpad is that it helps you keep track of all the code associated with a particular project. Even better, it makes it easy to branch someone else's code and then list your line of development right alongside others from the same project. Let's say you want to add support for a spell checker in the [[https://launchpad.net/pyroom/|PyRoom]] text editor. You create a branch of [[https://code.launchpad.net/~pyroom-dev/pyroom/trunk|PyRoom's trunk branch]], add your code and then upload your new branch to Launchpad. You're happy with your work and think it should be part of [[https://launchpad.net/pyroom/|PyRoom]]'s main release. You can tell the [[https://launchpad.net/pyroom/|PyRoom]] guys about this directly in Launchpad by registering a merge proposal. |
| Line 5: | Line 13: |
| '''Step 1:''' Visit the overview page of the source branch - i.e. the branch you want to merge with another. | ||<tablestyle="float:right; font-size: 0.8em; width:30%; background:#F1F1ED; margin: 0 0 1em 1em;" style="padding:0.5em;">{{attachment:propose1.png}}|| ||<style="text-align: center;">'''Registering a merge proposal'''|| |
| Line 7: | Line 16: |
| '''Step 2:''' Click ```Propose for merging``` in the ```Actions``` menu. | '''Step 1:''' Visit the overview page of your branch that you want to merge with someone else's branch. '''Step 2:''' Click ```Propose for merging into another branch``` below the branch information. |
| Line 11: | Line 23: |
| '''Step 4:''' If the source branch is not a direct branch of the target, use the ```Dependent branch``` field to specify the source branch's parent. | '''Step 4:''' Optionally, give more information about your merge proposal with an ```Initial Comment```. |
| Line 13: | Line 25: |
| '''Step 5:''' Optionally, use the whiteboard to give more information about your merge proposal. | '''Step 5:''' Click ```Propose Merge``` to complete. |
| Line 15: | Line 27: |
| '''Step 6:''' Click ```Register``` to complete. | = Handling branches proposed for merger with yours = If you find that someone has registered a merge proposal against a branch you own, you can also accept or reject the proposal in Launchpad. On your branch's overview page, you'll see all merge proposals listed in the ```Branches proposed to be merged into this one``` section. ||<tablestyle="font-size: 0.8em; width:30%; background:#F1F1ED; margin: 0 0 1em 1em;" style="padding:0.5em;">{{attachment:propose2.png}}|| ||<style="text-align: center;">'''Branches proposed for merging'''|| Click ```view proposal details``` for the merger proposal you want to review. You'll see a summary of the revisions that in the proposed branch that would be merged into your branch. Click ```Accept``` or ```Reject``` once you've reviewed the proposed branch. |
Overview
One of the great things about Launchpad is that it helps you keep track of all the code associated with a particular project. Even better, it makes it easy to branch someone else's code and then list your line of development right alongside others from the same project.
Let's say you want to add support for a spell checker in the PyRoom text editor. You create a branch of PyRoom's trunk branch, add your code and then upload your new branch to Launchpad.
You're happy with your work and think it should be part of PyRoom's main release. You can tell the PyRoom guys about this directly in Launchpad by registering a merge proposal.
Registering a merge proposal
|
Registering a merge proposal |
Step 1: Visit the overview page of your branch that you want to merge with someone else's branch.
Step 2: Click Propose for merging into another branch below the branch information.
Step 3: Enter the name of the target branch, or click Choose to search. The development focus branch should be selected by default.
Step 4: Optionally, give more information about your merge proposal with an Initial Comment.
Step 5: Click Propose Merge to complete.
Handling branches proposed for merger with yours
If you find that someone has registered a merge proposal against a branch you own, you can also accept or reject the proposal in Launchpad.
On your branch's overview page, you'll see all merge proposals listed in the Branches proposed to be merged into this one section.
|
Branches proposed for merging |
Click view proposal details for the merger proposal you want to review. You'll see a summary of the revisions that in the proposed branch that would be merged into your branch.
Click Accept or Reject once you've reviewed the proposed branch.
