[Buildbot-devel] step.SVN & merges

[Eli Carter]

All,

I'm not finding any support for this, so...

I want to be able to do builds of merged source code.  In other words:
svn co [whatever] source
svn merge --revisions [start]:[end] [whateverelse] source
(failure on conflicts)
...and build, etc.

The "common" case would be
whatever = http://server/repos/project/trunk
whateverelse = http://server/repos/project/branches/workbranch

(The CVS translation of this would be:
cvs co [whatever] source
cd source && cvs up -j workbranch
)

I don't see any support for this in the step.SVN code.  I do see the patch
support, which is similar.

Before I dig too deep, has anyone else wanted to do this?  Any suggestions
of how this should be done?  Do I need to extend the build slaves to
support the merge step as part of step.SVN?  Or does this belong at a
different level?  Should I add a step.SVNmerge instead?  (Since merges
will not always be to trunk/HEAD, you may wind up with
basebranch=,mergebranch=, and in extreme cases may want to merge multiple
branches.)  Or should I add a mode="merge" option to step.SVN? 
(...addStep(step.SVN, mode='clobber',...), ...addStep(step.SVN,
mode='merge',...)

Thoughts?

Eli