On 7/8/05, Phil Lawrence <prlawrence@lehigh.edu> wrote:
> But what about when VEN7 arrives? We can create a VEN7 branch from
> our current HEAD, and work for a while on that branch to get it to
> work with the new vendor software.
>
> But, what would we do with the frabblewizzit example? Do we merge
> branch 656 -> HEAD and then merge the HEAD change into the VEN7 branch?
>
> Or do we wait until VEN7 is pretty stable, and then merge the
> changeset of all the recent HEAD revisions into the VEN7 branch, and
> then continue to merge all HEAD revisions into VEN7 as they happen?
> And then finally merge VEN7 somehow back into HEAD when we upgrade?
>
> Or do we not merge *anything* from HEAD into VEN7 and just merge VEN7
> into HEAD when we're ready for the upgrade?
>
Typically long-lived branches (like the VEN7 branch) would have the
trunk merged into them periodically so that they stay in sync, thus
minimizing the changes when VEN7 is merged back into the trunk.
So for branches like 656 which are made for short term work, they
would be made from and merged back to the trunk. Then those changes
would then be propagated to VEN7 at the next merge from the trunk.
see http://svnbook.red-bean.com/en/1.1/ch04s04.html#svn-ch-4-sect-4.4.2
for more detail.
Josh
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jul 8 23:00:02 2005