Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
agasti:developer:launchpad_code_submission [2011/03/25 23:11]
cheuschober
agasti:developer:launchpad_code_submission [2011/03/26 19:02] (current)
Line 5: Line 5:
 This guide assumes you have already discovered how to [[agasti:developer:bzr how-to|make your own local branch using bazaar]] and are now ready to share your changes back to a main project branch. This guide assumes you have already discovered how to [[agasti:developer:bzr how-to|make your own local branch using bazaar]] and are now ready to share your changes back to a main project branch.
  
-===== Step 1: Merge in Updates from the Parent =====+===== Step 1: Prepare for a Merge =====
 The first step on the road to code submission is getting your branch back up to speed. The first step on the road to code submission is getting your branch back up to speed.
  
Line 22: Line 22:
 </code> </code>
  
-=== Merge from Parent ===+===== Step 2: Merge from Parent =====
 Now that you've committed, you can merge in changes from your parent branch. Do you see above, how I created this branch from lp:sahana-agasti/mayon? Well, we'll want to use that branch to get any updates that have happened there since we last merged changes. Now that you've committed, you can merge in changes from your parent branch. Do you see above, how I created this branch from lp:sahana-agasti/mayon? Well, we'll want to use that branch to get any updates that have happened there since we last merged changes.
 +
 +<code bash>
 +bzr merge lp:sahana-agasti/mayon
 +</code>
  
 === Deal with Conflicts (Eeep!) === === Deal with Conflicts (Eeep!) ===
Line 35: Line 39:
  
 Oh, and while you're at it, we wholly recommend using [[http://meld.sourceforge.net/|Meld]] for your visual diffs. You can find it in most Linux distribution repositories and on our [[agasti:mayon:developer live disc|Mayon Developer's Live Disc]]. Oh, and while you're at it, we wholly recommend using [[http://meld.sourceforge.net/|Meld]] for your visual diffs. You can find it in most Linux distribution repositories and on our [[agasti:mayon:developer live disc|Mayon Developer's Live Disc]].
 +
 +Once you've fixed the conflicted files, you can officially resolve the conflict by issuing the following.
  
 <code bash> <code bash>
Line 81: Line 87:
 </code> </code>
  
-In our case above, we start by pointing our merge directive back to its parent branchthis is so bzr can know what to diff against. Our send message should tell the branch maintainers what you introduced that was new and what base revision you merged from in the parent. The last file, /some/file/location.bzr is a file, anywhere on your filesystem, for the diff output. We'll need this file in the next step, so pay attention to where you put it!+In our case above, we start by pointing our merge directive back to its parent branchthis is so bzr can know what to diff against. Our send message should tell the branch maintainers what you introduced that was new and what base revision you merged from in the parent. The last file, /some/file/location.bzr is a file, anywhere on your filesystem, for the diff output. We'll need this file in the next step, so pay attention to where you put it!
  
 ===== Step 6: Create a Bug Report and Add your Directive ===== ===== Step 6: Create a Bug Report and Add your Directive =====
Line 88: Line 94:
 At the bottom of the bug report you can then attach a patch file by clicking //extra options//. Use this opportunity to attach the diff file you just created in the last step. Once you've sufficiently documented your changes and attached your patch, submit your bug report and move to the next (and final) step. At the bottom of the bug report you can then attach a patch file by clicking //extra options//. Use this opportunity to attach the diff file you just created in the last step. Once you've sufficiently documented your changes and attached your patch, submit your bug report and move to the next (and final) step.
  
 +{{:agasti:developer:launchpad_bug_extra_options.png}}
  
 ===== Step 7: Be Patient, but Be Active! ===== ===== Step 7: Be Patient, but Be Active! =====
-This is perhaps the easiest step of the whole process. After you submit a merge request via your merge directive, please stick around! Hang out on IRC with us on IRC or by e-mail and be ready to answer questions about your directive. If you've created a module, pay attention to any security alerts that may arise around your new submission. It's very difficult for maintainers to justify merging code from someone who's unwilling to discuss it. +This is perhaps the easiest step of the whole process. After you submit a merge request via your merge directive, please stick around! Hang out with us on IRC or by e-mail and be ready to answer questions about your directive. If you've created a module, pay attention to any security alerts that may arise around your new submission. It's very difficult for maintainers to justify merging code from someone who's unwilling to discuss it. 
  
 We also ask that you please be patient regarding your submission. We have some very smart maintainers, but unfortunately, sometimes they're just a little overtaxed and it can take some time for code to make it into the tree. While you're waiting, it would be a great time to make a [[agasti:start|wiki page]] about your new submission. We also ask that you please be patient regarding your submission. We have some very smart maintainers, but unfortunately, sometimes they're just a little overtaxed and it can take some time for code to make it into the tree. While you're waiting, it would be a great time to make a [[agasti:start|wiki page]] about your new submission.

QR Code
QR Code agasti:developer:launchpad_code_submission (generated for current page)