We have a cvs tree, on which we work for quite some time now since the sources were first imported. As a result a considerable amount of changes have been collected. Now the "vendor" has shiped a new version and we would like to merge the changes back to our tree. Due to the complexity of the task the mege will take several days. If we follow the normal merging procedure the main-trunk (used by all the developers not normally involved in the merge operation) will remain unstable for all that period.
So I'm wondering if it would be possible to perform the whole merging proccess on a branch and only when we 're finished (and reasonably sure that the resulting source-tree is stable) merge from this branch to the main trunk? How can this be done, if at all possible? What are the sugested practices for similar cases (not wanting to destabilizing you trunk durring a painfull merging period)? Thanks in advance /npat -- Mathematics belongs to God. -- Donald E. Knuth _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
