Using bazaar without write permission

joejoe2010

Hello everybody,

I've got a question about bazaar:
If found this on the wiki: It is highly recommended to first commit all your own local changes, before doing a merge.
For those who don't have write permissions on the repository, how can they create some kind of local repository to save their changes before doing a merge with the online repository in order to keep their own changes?

To tell the truth this process of changing between local and online repository wasn't very clear for me using git.

Thank you

Joachim

pokorra

Hello Joachim,

thanks for your comment!
I will have to adjust the documentation to make it clearer how this will work.

We are still in the process of getting used to Bazaar ourselves, that is the reason we have not announced it offically yet.

I think, you can create a branch in your own local repository, without binding to the central repository, and you should commit into that local branch before you do a merge from the central repository.
I think you can also create a branch on Launchpad from the central repository, that would give you a good backup for your own changes.

I hope we can soon give more documentation for this.

Timotheus

joejoe2010

Hello Timotheus,

I've almost finished the translation of the webpage into spanish and I've been trying now what you've suggested to commit it.

First of all I created a branch which contains now the new index.php and a folder named es.

My folder structure is now:
bzr
__ .bzr
__ trunk
____ ...
__ website-es
____ .bzr
____ es/
____ index.php

After that I made a commit to my local branch. But as my working tree is still pointing to the trunk folder structure nothing seems to happen.
Do I need to change my working tree?
If I copy the files into the trunk and then make a commit then they are added to my local branch.

Furthermore I created a branch on launchpad and made a
bzr push --use-existing lp:_{jomammele/openpetraorg/website-spanish}

This went well and I can now see the proper files in the branch. (bazaar.launchpad.net/_jomammele/ ... A/website/)

Am I doing right?

Btw: How are bzr.openpetra.org and launchpad connected?

Thank you

Joachim

pokorra

Hello Joachim,

as we have talked in IRC, I have created now a new repository for the website.

You can download it from here (once I get your public ssh key),
[bzr+ssh://@bzr.openpetra.org">bazaar@[deleted].openpetra.org:2208/website/trunk](bzr+ssh://@bzr.openpetra.org">bazaar@[deleted].openpetra.org:2208/website/trunk)

or anonymously: bzr.openpetra.org:8008/website/trunk

I have updated the sources with the new links from the current website (with IRC link etc).

I have not merged your spanish translation yet.

We can do two options: either you push your version with just the website to another repository on launchpad, not your current one on launchpad that includes all the code.
Or I try to give you write access to a branch on the bzr.openpetra.org server for the website. I would need your public ssh key for that.

Timotheus

joejoe2010

Hello Timotheus,

I've been trying submitting to launchpad as described here: sourceforge.net/apps/mediawiki/o ... _launchpad

It works fine until getting to the point where I have to switch to launchpad. I get the following error message.
Run command: bzr switch lp:_{jomammele/openpetraorg/website-spanish}

bzr: ERROR: Cannot lock LockDir(bzr.openpetra.org:8008/website/t ... ranch/lock): Transport operation not possible: http does not support mkdir()

See attachment

Do you have an idea what to do?

Thank you

Joachim

pokorra

Hello Joachim,
I was able to reproduce your situation.
It seems you get that error only when you do a lightweight checkout. It seems then bzr tries to get a lock on the source repository, which over http we don't have the permissions for.

The solution is to create a non-light-weight ckeckout in the first place. I have updated the wiki page on that.

Thanks for finding this,
Timotheus

thiasg

Hi Joachim, hi Timotheus,

instead of a checkout, you should do a branch, e.g.
bzr branch bzr.openpetra.org:8008/website/d ... h_website/
The local branch you could push to launchpad like detailed on the launchpad site.

Matthias

PS: If we want to support access rights for a branch in the website repo on our bazaar server, I would need to add some bits to our access rights plugin...

pokorra

Hi Matthias,

the GUI does not make much a difference between a branch and a checkout, that is a little bit confusing in the GUI. So perhaps your suggestion for the command line is cleaner. I will leave it on the wiki page for launchpad instructions as it is for the moment, using a full checkout it should work.

For access rights for a branch for the website repo, I think that is not worth investing time at the moment.

My hope is, that if we get good experience with working with launchpad branches as well. People can create their own branches on launchpad, and tell us the URL for merging. This might give us an easier alternative to accept patches etc, without having to create users all the time and create branches and assign permissions. We will see how it works out.

Timotheus