> One answer that comes to mind is to remember this, and on the master
> branch revert the commit after the merge that introduces it.
>
> X--o--A--o--o [v2.4_branch]
> \ \
> o--o--o--M--A' [master]
>
> X represents the place where we branched 2.4, A represents the change
> to disable incomplete pncconf features, and A' represents the revert of
> A. (Optionally, squash A' into M so that they're a single commit)
>
So this is what I did and it worked fine. Thanks.
next question.
When 2.4 is merged to master again will I have to do it again?
Truthfully I don't understand why we merge 2.4 to master.
Is this a temporary thing, done untill 2.4 is released?
Chris M
_________________________________________________________________
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers
