[Buildbot-devel] [RFC+PATCH] Building from a merged source tree

[Eli Carter]

All,

We do development on a branch, then merge to trunk when a task is
completed.  This allows us to prevent breaking trunk (most of the time). 
But merge conflicts and integration bugs can bite you.  So, I want to use
buildbot to do a test build of the proposed merged tree.

So I need buildbot to checkout trunk and merge in the branch, then do the
build, test, etc. steps.

To do that, I added a 'merge' mode to the SourceBase class, and
implemented it for SVN.  The attached patch is my first run at it, has
been only lightly tested, and does little error checking.  Even so, any
and all feedback on this is welcome.  In particular, is this approach
valid?  Is it something that (after being cleaned up) would be viable for
inclusion in the official tree?

The patch is against Sourceforge CVS.

Comments?

Eli Carter
eli.carter at commprove.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: buildbot-0.7.4cvs20061017-source-merge.patch
Type: text/x-patch
Size: 8625 bytes
Desc: not available
URL: <http://buildbot.net/pipermail/devel/attachments/20061023/1419396f/attachment.bin>