[Top][All Lists]

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

Re: How to avoid propogation of changes

From: David H. Thornley
Subject: Re: How to avoid propogation of changes
Date: Thu, 15 Mar 2001 13:22:40 -0600

address@hidden wrote:
> At any given time, we have multiple releases of our software under
> development. Each release has it's own branch, with the latest release
> being developed on the trunk. We propogate changes downstream by doing
> merges from each release branch to the immediate downstream release
> branch.
> Here is the problem: What if we make a change that we don't want
> propogated downstream. Does any one know of a good way to accomplish
> this?
Um, don't propagate it?

Seriously, CVS doesn't move propagate changes by itself, so you
must have some sort of mechanism to do so.  This means you've
got to figure out how to optionally disable it.

To give an example, we maintain _MERGED tags on our branches, so
BRANCH_3 would have an associated BRANCH_3_MERGED tag.  We have
a Perl script that will merge from a branch to, say, head.
It merges everything from BRANCH_3_MERGED to BRANCH_3, and then
moves BRANCH_3_MERGED.  This means that the way to avoid
propagating a change is to move BRANCH_3_MERGED past it, and
this is indeed what we do (I've got a Perl script for that, too,
for consistency, and it's pretty short.)

David H. Thornley                          Software Engineer
at CES International, Inc.:  address@hidden or (763)-694-2556
at home: (612)-623-0552 or address@hidden or

reply via email to

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