← Back to team overview

launchpad-users team mailing list archive

Re: Merging Branches

 

On Fri, 13 Mar 2009 16:20:09 -0300, Tim Cook <timothywayne.cook@xxxxxxxxx>
wrote:

> 
> I can't seem to find where the final step in causing branches to be
> merged on Launchpad exists.  
> 
> I've read all about the review process, but how does the actual merge
> take place?

You'll need to merge them yourself (or the owner of the branch will need to
merge them).  Usually, it's just a bzr merge <source_branch> in your local
copy of the target branch, and then commit and push.

If you're really keen to have them merged automatically, you
should look at Tarmac[1], which uses the Launchpad API to find approved
branches and merges them.  It even has the ability to run hooks for the commit,
so you can ensure that the branch doesn't break your tests or any number of
situations.

[1] http://edge.launchpad.net/tarmac

Cheers,
-- 
Paul Hummer
http://theironlion.net
1024/862FF08F C921 E962 58F8 5547 6723 0E8C 1C4D 8AC5 862F F08F



Follow ups

References