An easy one for ya!

the way we manage our development is so that all work is done in branches. Limited to 1 new feature or 1~6 fixes (depending on size/scope) per branch.

Now lets say I merge in a branch that has 6 fixes in it, into our Main(trunk). if it is decided to back out 1 of those features the only I know how is to remove all the features that came with it, and then resurrect the branch they came from.. remove the feature from that and then re-merge the remaining features..

to avoid doing this I wonder, is it possible to generate a patch file form the parent branch and generate a patch of the work done for a fix, and then apply it to the main development in reverse? so it REMOVES what the patch matches rather than adds?

suggestions/answers on a postcard!

-----------------------
N: Jon Hardcastle
E: Jon_at_eHardcastle.com
'Do not worry about tomorrow, for tomorrow will bring worries of its own.'
-----------------------

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2405534

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-09 15:43:08 CEST