You are not logged in.

#1 2012-05-01 08:01:09

lemanski6
Member
Registered: 2011-05-02
Posts: 15

Bzr merging

How do you merge changes from the other branches into the main branch in a PKGBUILD?

Example: The main branch is lp:package, and the branches with the changes are lp:/package/change1 and lp:/package/change2.

Offline

#2 2012-05-01 18:34:15

triplesquarednine
Member
Registered: 2011-04-12
Posts: 630

Re: Bzr merging

lemanski6 wrote:

How do you merge changes from the other branches into the main branch in a PKGBUILD?

Example: The main branch is lp:package, and the branches with the changes are lp:/package/change1 and lp:/package/change2.

Can you give a more specific example? (like the exact software + branches)

Can you also specify your reasons for wanting to do so?

I say this because usually the maintainers and devs of a given package on lp:/bzr handle merges. Typically, you have alternate branches that contain fixes / modifcations / etc, but those are usually branches that people are testing, before they get merged into the master branch. ( i test the odd branch of compiz, as well as different revisions, to help solve bugs, verify fixes in other branches proposed for merging (into master) work, etc).

Merging in bazaar is really simple, though;

http://doc.bazaar.canonical.com/latest/ … anges.html

As far as the PKGBUILD, read up in the Archwiki on the subject, so that you better understand how they work;

https://wiki.archlinux.org/index.php/PKGBUILD
https://wiki.archlinux.org/index.php/Creating_Packages

you probably just need to add a few lines to your pkgbuild. Most likely somewhere after the pkgbuild instructions pulls from lp:/bzr master branch and obviously these 'merge commands' will need to execute somewhere before it starts the actual build/compilation. The 'merge commands' will also need to be executed from within the master branch in your pkgbuild...Remember PKGBUILDs are just instructions and they are procedural. ie: step1->step2->step3->etc.

I advise reading up on both bazaar and PKGBUILDs, it shouldn't be too difficult to figure out.

cheerz

Last edited by triplesquarednine (2012-05-01 18:36:33)

Offline

#3 2012-05-01 19:33:34

lemanski6
Member
Registered: 2011-05-02
Posts: 15

Re: Bzr merging

Ok, how about setting the "whoami" variable, as without it bzr won't commit.

I could just set it with bzr whoami "Your name <email@domain.com>", but what about people that have already set their id,

how do i avoid overwriting their bzr id?

Offline

#4 2012-05-01 20:07:09

triplesquarednine
Member
Registered: 2011-04-12
Posts: 630

Re: Bzr merging

lemanski6 wrote:

Ok, how about setting the "whoami" variable, as without it bzr won't commit.

I could just set it with bzr whoami "Your name <email@domain.com>", but what about people that have already set their id,

how do i avoid overwriting their bzr id?

this i don't know. For one, not everyone has an ID - so it's not just a matter of 'discovering' theirs and using it.... I think you really need to read through all (relevant) parts of bazaar's documentation....

But, I still for the life of me do not even get why you want to make a pkgbuild that handles merging (testing/fixes) branches. The developers of a given application will merge those branches - *when they are ready to be merged* ...

you also still haven't listed the said package(s), nor the branches in themselves. Nor have you explained what exactly you are trying to accomplish.

cheerz

Offline

Board footer

Powered by FluxBB