How to deliver dependant patches separatly ?

How to deliver dependant patches separatly ?

[Nayfe]

Hi, 
Let me explain my problem : 

I work for companyC. We work for companyB that works for companyA.
	CA ==> CB ==> CC

CA gives CB somes features to implement (fix, evolutions).
CB gives CC these features.
CC do the work then delivers to CB the patches.
Then CB decides to deliver or NOT the patches.

CA has a very long term integration workflow and want to select 
the patches they pay and not every patches made. 

CA --featX--> CB --featX--> CC
CA --featY--> CB --featY--> CC
              CB <--featX-- CC
              CB <--featY-- CC
CA <--featY-- CB
(featX not delivered)

The problem is when featX and featY are two dependant patches
and one patch is not delivered. 

In that case, we need to develop two independant patches in order 
to allow CA to switch between featX and featY.

But, CB is responsible for integration of patches for CA, and the person in
charge 
is not enough close to code to understand how to resolve merge conflicts.

CA and CB workflows can't be modified and they want us (CC) 
to give patches without merge conflicts problems.

The only solution we found is to create a branch for each feature (normal :)
) 
and a branch for every combinaisons : ( featX, featY, featZ, featXY, featXZ,
featYZ, featXYZ )
and the integrator just have to select the combinaison he wants.

I personnaly found that solution quite annoying, but can't find another
solution.
If you understood my problem, do you have a better solution (other than
leaving CC) ? ;)
thanks.
-- 
View this message in context: http://www.nabble.com/How-to-deliver-dependant-patches-separatly---tp22120045p22120045.html
Sent from the git mailing list archive at Nabble.com.