Our team has a strange setup. We have 3 concurrent releases of a project 
all being worked on at once. For simplicity I will call them A, B, and C.

C is the trunk. A and B are branches, and the rule is that when a change is 
made to B that change must be merged in to C. When a change is made to A it 
may or may not be merged in to the other two. That is dependent on some 
more complex case by case rules. We are fine with handling those merges 
manually, but we would really like the merge from B to C to be handled by 
jenkins.

I've gotten it to work by setting up B with 'This project builds a 
Subversion feature branch' checked and the upstream project name set to C's 
project name. Then in C I have "Accept Integration from Subversion feature 
branches" checked. Finally I have a post-build action in B set to 
"Integrate to upstream upon successful build". Like I said.. it did work. 
Then after a few times of working and a few checkins later (some checkins 
to B and some to C) it now always says "No changes to be integrated. 
Skipping integration."

Reply via email to