How to commit to launchpad: Difference between revisions
Jump to navigation
Jump to search
Joejoe2010 (talk | contribs) No edit summary |
Joejoe2010 (talk | contribs) No edit summary |
||
Line 13: | Line 13: | ||
bzr push lp:~jomammele/openpetraorg/template-changes_110811 | bzr push lp:~jomammele/openpetraorg/template-changes_110811 | ||
* 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. | * 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:~jomammele/openpetraorg/template-changes_110811 | |||
* Now you can add files and change existing files, and commit them to your branch at Launchpad. | * Now you can add files and change existing files, and commit them to your branch at Launchpad. |
Revision as of 07:36, 12 August 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.
- Do a checkout of OpenPetra from
http://bzr.openpetra.org:8008/openpetra/trunk
(or if you are working on the website,http://bzr.openpetra.org:8008/website/trunk
). You need to get a full checkout, ie. NOT a light-weight checkout, since that would not allow you to switch later, somehow a lock would be required on the source repository. If you're using the bazaar command line, change to your bazaar directory and execute eg.
bzr checkout http://bzr.openpetra.org:8008/website/trunk D:\openPetra.org-Files3\bzr\website-launchpad\trunk
- 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
.
If the corresponding button is not visible then execute the following command:
bzr push lp:~jomammele/openpetraorg/template-changes_110811
- 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:~jomammele/openpetraorg/template-changes_110811
- 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
(orhttp://bzr.openpetra.org:8008/website/trunk
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
bzr break-lock bzr+ssh://bazaar.launchpad.net/~jomammele/openpetraorg/website-spanish/