How to commit to launchpad: Difference between revisions

From OpenPetra Wiki
Jump to navigation Jump to search
No edit summary
Line 1: Line 1:
If you don't have write privilages on bzr.openpetra.org you can also commit to launchpad.
If you don't have write privileges on bzr.openpetra.org you can also commit to launchpad.
This can be done the following way:
This can be done the following way:


- Create a public and private key on launchpad. This is explained [https://help.launchpad.net/YourAccount/CreatingAnSSHKeyPair here].
* Create a public and private key on launchpad. This is explained [https://help.launchpad.net/YourAccount/CreatingAnSSHKeyPair here].
It is quite important to execute pageant and to load the private key into pageant.
It is quite important to execute pageant and to load the private key into pageant.


- Create (Register) a branch on launchpad.
* In your bazaar, you need to tell your launchpad username, on the command line run <code>bzr launchpad-login USERNAME</code>. I have not found a place in the GUI to do this.


- Create a branch in bazaar and create your code. Commit it to the local branch on your hard drive.
* Do a checkout of OpenPetra from <code>http://bzr.openpetra.org:8008/openpetra/trunk</code> (or  if you are working on the website, <code>http://bzr.openpetra.org:8008/website/trunk</code>).


- After that you will do a push to launchpad (fe. to bzr+ssh://bazaar.launchpad.net/~jomammele/openpetraorg/website-spanish/)
* In your local working tree, push to Launchpad which will create a new branch there: <code>lp:~USERNAME/openpetraorg/BRANCH_NAME</code>, eg. <code>lp:~jomammele/openpetraorg/website-spanish</code>.


* Then you switch your local working tree to <code>lp:~USERNAME/openpetraorg/BRANCH_NAME</code>. This means that all your future commits will go to your branch at Launchpad.
* Now you can add files and change existing files, and commit them to your branch at Launchpad.
* If you want to get the latest version from OpenPetra, do a merge from <code>http://bzr.openpetra.org:8008/openpetra/trunk</code> (or <code>http://bzr.openpetra.org:8008/website/trunk</code> if you are working on the website)
* If you want your changes to be merged into the OpenPetra bzr, tell a core developer the URL of your branch. It is recommended to have small branches for each feature that you want to go upstream. You will not be able to reuse a branch, after it has been merged into openpetra trunk, since we want to avoid criss cross merges etc.


If you get an unlock error-message execute a
If you get an unlock error-message execute a
   bzr break-lock bzr+ssh://bazaar.launchpad.net/~jomammele/openpetraorg/website-spanish/
   bzr break-lock bzr+ssh://bazaar.launchpad.net/~jomammele/openpetraorg/website-spanish/

Revision as of 16:32, 13 Ocak 2011

If you don't have write privileges on bzr.openpetra.org you can also commit to launchpad. This can be done the following way:

  • Create a public and private key on launchpad. This is explained here.

It is quite important to execute pageant and to load the private key into pageant.

  • In your bazaar, you need to tell your launchpad username, on the command line run bzr launchpad-login USERNAME. I have not found a place in the GUI to do this.
  • In your local working tree, push to Launchpad which will create a new branch there: lp:~USERNAME/openpetraorg/BRANCH_NAME, eg. lp:~jomammele/openpetraorg/website-spanish.
  • Then you switch your local working tree to lp:~USERNAME/openpetraorg/BRANCH_NAME. This means that all your future commits will go to your branch at Launchpad.
  • Now you can add files and change existing files, and commit them to your branch at Launchpad.
  • If you want your changes to be merged into the OpenPetra bzr, tell a core developer the URL of your branch. It is recommended to have small branches for each feature that you want to go upstream. You will not be able to reuse a branch, after it has been merged into openpetra trunk, since we want to avoid criss cross merges etc.

If you get an unlock error-message execute a

 bzr break-lock bzr+ssh://bazaar.launchpad.net/~jomammele/openpetraorg/website-spanish/