[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Merging from vendor-branch to branch

From: Nick Patavalis
Subject: Merging from vendor-branch to branch
Date: Wed, 23 Oct 2002 00:39:53 +0300
User-agent: Mutt/1.4i

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

Mathematics belongs to God.
  -- Donald E. Knuth

reply via email to

[Prev in Thread] Current Thread [Next in Thread]