{"thread":{"id":"17920","subject":"How to deliver dependant patches separatly ?","startedAt":"2009-02-20T12:58:50Z","lastAt":"2009-02-20T12:58:50Z","messageCount":1,"participants":["Nayfe"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"105604","messageId":"22120045.post@talk.nabble.com","threadId":"17920","inReplyTo":null,"subject":"How to deliver dependant patches separatly ?","fromName":"Nayfe","fromEmail":"nefethael@hotmail.com","sentAt":"2009-02-20T12:58:50Z","receivedAt":"2009-02-20T12:58:50Z","isPatch":false,"sender":{"key":"nefethael@hotmail.com","avatar":null},"body":"\nHi, \nLet me explain my problem : \n\nI work for companyC. We work for companyB that works for companyA.\n\tCA ==> CB ==> CC\n\nCA gives CB somes features to implement (fix, evolutions).\nCB gives CC these features.\nCC do the work then delivers to CB the patches.\nThen CB decides to deliver or NOT the patches.\n\nCA has a very long term integration workflow and want to select \nthe patches they pay and not every patches made. \n\nCA --featX--> CB --featX--> CC\nCA --featY--> CB --featY--> CC\n              CB <--featX-- CC\n              CB <--featY-- CC\nCA <--featY-- CB\n(featX not delivered)\n\nThe problem is when featX and featY are two dependant patches\nand one patch is not delivered. \n\nIn that case, we need to develop two independant patches in order \nto allow CA to switch between featX and featY.\n\nBut, CB is responsible for integration of patches for CA, and the person in\ncharge \nis not enough close to code to understand how to resolve merge conflicts.\n\nCA and CB workflows can't be modified and they want us (CC) \nto give patches without merge conflicts problems.\n\nThe only solution we found is to create a branch for each feature (normal :)\n) \nand a branch for every combinaisons : ( featX, featY, featZ, featXY, featXZ,\nfeatYZ, featXYZ )\nand the integrator just have to select the combinaison he wants.\n\nI personnaly found that solution quite annoying, but can't find another\nsolution.\nIf you understood my problem, do you have a better solution (other than\nleaving CC) ? ;)\nthanks.\n-- \nView this message in context: http://www.nabble.com/How-to-deliver-dependant-patches-separatly---tp22120045p22120045.html\nSent from the git mailing list archive at Nabble.com.\n"}]}