OK, I have all the branch, update, commit, R2M workflow sorted out and for that I use the command line bzr tools. What I don't know how to do is to take a branch that someone else has done and merge it to core (now I have gate keeper powers and all that).

Can anyone point me in the right direction - preferably with the use of command line goodness ?

Tblue will have it down for ya, but I'll try a quick stab at it without ANY actual mechanism defined.

1) Double-triple-quadruple check everything you are about to do.2) Get fresh brand new shiny bright branch of core (name as you see fit, I always delete my "quam-plures" and get that name again)3) Repeat step one4) MERGE branch_you_want_in_core into shiny_new_copy_of_core5) Repeat step one6) COMMIT shiny_new_copy_of_core

One thing I almost always forget in #6 is to put the name of the branch author into it. LP/BZR is so friggin stupid about that: it knows everything about changes in everything back to the dawn of time down to the last comma, but it can't seem to figure out who actually contributed to the branch getting merged into something else? Sheesh...

Anyway a good way to figure it out without risk to core is to get core, push it as "testing-whatever", then merge your target branch into your test-whatever. Have you done much of getting changes to your computer that someone else has sent to LP? Have you done much of merging changes into a branch on your computer? If not we can work together on this. You make a new branch for a playground thing. I'll branch it and do some obviously huge changes. You then go through the steps above and see the changes in your playground branch on LP. That'll tell you that you got the steps eh?

Next I have to unbind in order to have the bind option available. Perhaps the bind command automagically unbinds? Perhaps the way you are getting a branch means it is unbound? Dunno! Anyway your core update task will need your shiny_new_core to be bound to core itself.

It truncated that string. It shows me commands, but obviously not in the same way you see them if you actually use command line.

Now I have a new core with a merged in branch, so it is time to commit the changes complete with a fake author credit. Remember I bound this to elsewhere and you need to be bound to core itself. Otherwise it's the same exact thing.

So yeah you got it all going on, just got to string it together for a core commit. Single biggest diff is that your new copy of core needs to be bound to core. I can't find a command that will tell me what any given branch I have is bound to, but I did learn that it seems possible to get files that are not bound to anything. Thus you need to figure out how to bind to core. I can probably cheat my way to that because each time I bind and unbind the unbind command defaults to the last bound branch. Which means if I branch and unbind then rebind I'll know the bzr command

No worries. We all have other things to do. That is why I am getting up to speed with merging to core. What with EdB building QP5 there is only me and you who will merge new changes to core (unless Ed wants to dip in every now and then).