Difference between revisions of "How to commit to launchpad"

From OpenPetra Wiki
Jump to navigation Jump to search
Line 1: Line 1:
If you don't have write privileges 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:
 
  
* First get an account on Launchpad, which is a service provided by the company Canonical, who develop Ubuntu and Bazaar: https://login.launchpad.net/+new_account
+
    First get an account on Launchpad, which is a service provided by the company Canonical, who develop Ubuntu and Bazaar: https://login.launchpad.net/+new_account
* 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.
+
    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 <code>bzr launchpad-login USERNAME</code>. You can do this in the GUI as well, in the menu Bazaar / All Commands / category Launchpad, Command launchpad-login, and enter your launchpad id as the parameter.
+
    In your bazaar, you need to tell your launchpad username, on the command line run bzr launchpad-login USERNAME. You can do this in the GUI as well, in the menu Bazaar / All Commands / category Launchpad, Command launchpad-login, and enter your launchpad id as the parameter.  
  
* then go to https://code.launchpad.net/openpetraorg/+addbranch to create a new branch. It will have the url <code>lp:~USERNAME/openpetraorg/BRANCH_NAME</code>
+
    then go to https://code.launchpad.net/openpetraorg/+addbranch to create a new branch. It will have the url lp:~USERNAME/openpetraorg/BRANCH_NAME  
  
* Do a checkout now from that url <code>lp:~USERNAME/openpetraorg/BRANCH_NAME</code>
+
    Create a directory on your local hard-disk named as your new branch
  
* Now you can add files and change existing files, and commit them to your branch at Launchpad.
+
    Do a checkout now from lp:~openpetraorg
 +
bzr checkout lp:openpetraorg .../openpetraorg/BRANCH_NAME/
  
* 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)
+
    Move into your branch directory and do a push to your newly created branch
 +
bzr push --use-existing-dir lp:~USERNAME/openpetraorg/BRANCH_NAME
  
* 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.
+
 +
    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. If the corresponding button is not visible then execute the following command:
 +
  bzr switch lp:~USERNAME/openpetraorg/BRANCH_NAME/
 +
 
 +
    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 http://bzr.openpetra.org:8008/openpetra/trunk
 +
 
 +
    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 12:38, 26 October 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:

   First get an account on Launchpad, which is a service provided by the company Canonical, who develop Ubuntu and Bazaar: https://login.launchpad.net/+new_account
   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. You can do this in the GUI as well, in the menu Bazaar / All Commands / category Launchpad, Command launchpad-login, and enter your launchpad id as the parameter. 
   then go to https://code.launchpad.net/openpetraorg/+addbranch to create a new branch. It will have the url lp:~USERNAME/openpetraorg/BRANCH_NAME 
   Create a directory on your local hard-disk named as your new branch
   Do a checkout now from lp:~openpetraorg
bzr checkout lp:openpetraorg .../openpetraorg/BRANCH_NAME/
   Move into your branch directory and do a push to your newly created branch
bzr push --use-existing-dir lp:~USERNAME/openpetraorg/BRANCH_NAME


   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. If the corresponding button is not visible then execute the following command:
 bzr switch lp:~USERNAME/openpetraorg/BRANCH_NAME/
   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 http://bzr.openpetra.org:8008/openpetra/trunk
   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/