2nd source.SVN build step picks up incorrect branch

[mmcdougall]

I have two important sub-directories that I want on my build slave -- buildscripts and archive. When I used the source.SVN build step to attempt to deploy these two folders, the second folder got the incorrect branch:

f.addStep( 

source.SVN,  baseURL=" svn+ssh://buildbot@ss.mycompany.com/svn/branches/jgale/",  defaultBranch="buildbot-build-archive",  directory="./build/archive",  haltOnFailure = 1  ) 

f.addStep( 

source.SVN,  baseURL=" svn+ssh://buildbot@ss.mycompany.com/svn/branches/jgale/",  defaultBranch="buildbot-buildscripts",  directory="./build/buildscripts",  haltOnFailure = 1  ) 

-- RESULTS IN -->

/usr/bin/svn checkout --revision 18837 --non-interactive  svn+ssh://buildbot@ss.mycompany.com/svn/branches/jgale/buildbot-build-archive archive /usr/bin/svn checkout --revision 18837 --non-interactive  svn+ssh://buildbot@ss.mycompany.com/svn/branches/jgale/buildbot-build-archive buildscripts

-- NOTE --> In the second checkout, I am getting the "archive" bits of my source repository, rather than the "buildscripts" bits of my source directory

[dustin]

This is because you're specifying defaultBranch, which is being overridden by the branch from the ChangeSource.

It doesn't look like it's possible to do what you want right now, from my read of the code. Want to write up a patch?

[mmacvicar]

I am also having this problem. I have at least 4 SVN buildsteps pulling from different places, sometimes it works, othe times the first steps is redirected to the changesource (thanks for pointing that out). I'll see if I can understand it enough to patch it.

I can probably work around it by using ShellCommand?( command = ['svn', 'up'...).

[dustin]

I *think* this is fixed in [c876363fe664fb9fa991f91d5b2c672639bd5a88], which was actually merged in 0.8.1. Please re-open if this is still a problem.