Drizzle Wiki
Register
(changed mypatch bad example to FallenPegasus' drizzle-fix-bugNNNNNN example)
Line 47: Line 47:
 
 
 
cd /some/working/dir
 
cd /some/working/dir
cd drizzle-mypatch-example
+
cd drizzle-fix-bugNNNNNN
 
# Make Changes
 
# Make Changes
 
bzr commit
 
bzr commit
Line 65: Line 65:
   
 
cd /some/working/dir
 
cd /some/working/dir
cd drizzle-mypatch-example
+
cd drizzle-fix-bugNNNNNN
 
bzr pull
 
bzr pull
   
Line 77: Line 77:
   
 
bzr push lp:~[yourloginid]/drizzle/[branch-name]
 
bzr push lp:~[yourloginid]/drizzle/[branch-name]
  +
  +
NOTE: The [branch-name] we have been using in the example is drizzle-fix-bugNNNNNN
   
 
= Propose branch =
 
= Propose branch =
 
 
On your Launchpad Code page https : //code.launchpad.net/~[yourloginid]/drizzle/[branch-name] click the '''Propose for merging into another branch''' link to p ropose branch to the maintainers to be merged into the main trunk.
+
On your Launchpad Code page https : //code.launchpad.net/~[yourloginid]/drizzle/[branch-name] click the '''Propose for merging into another branch''' link to propose branch to the maintainers to be merged into the main trunk.
   
 
[[Category:Development]]
 
[[Category:Development]]

Revision as of 10:25, 3 August 2008

Pre-requisites

You need Bazaar for revision control.

Login Setup

  • Get a launchpad account at https://launchpad.net/+login
  • When logged in, setup your SSH keys
    • Click your name (top right corner)
    • Click Change Details link (upper right)
    • Click SSH Keys button (middle of page)
    • Upload your public SSH key (How do I get a public key?)
  • Register yourself
bzr launchpad-login [your id]

Getting the code

You should prepare a directory to keep bzr work in

mkdir /some/working/dir
bzr init-repo /some/working/dir

You should first create a clean repo.

cd /some/working/dir
bzr branch lp:drizzle

You can see the current history with:

cd /some/working/dir
cd drizzle
bzr log | more

You can now create a working copy of the clean repo

cd /some/working/dir
bzr branch drizzle drizzle-fix-bugNNNNNN
cd drizzle-fix-bugNNNNNN

NOTE: Use descriptive names such as drizzle-fix-bugNNNNNN (where NNNNNN is the bug # of course).

You should now Compile Drizzle.

Adding your contribution

With a working version, you can commence making changes in your new branch, committing code regularly to your local working copy.

cd /some/working/dir
cd drizzle-fix-bugNNNNNN
# Make Changes
bzr commit


Prior to publishing your completed work, you need update your local copy of the trunk, and then merge any changes into your working branch.

Merging recent changes

Update your local trunk.

cd /some/working/dir  
cd drizzle
bzr pull   

Updating your local branch.

cd /some/working/dir
cd drizzle-fix-bugNNNNNN
bzr pull

Verify differences carefully

bzr diff

Publish your branch

When all changes are merged and your changes are all consistent you can push your branch to LaunchPad

bzr push lp:~[yourloginid]/drizzle/[branch-name]

NOTE: The [branch-name] we have been using in the example is drizzle-fix-bugNNNNNN

Propose branch

On your Launchpad Code page https : //code.launchpad.net/~[yourloginid]/drizzle/[branch-name] click the Propose for merging into another branch link to propose branch to the maintainers to be merged into the main trunk.