Re: Multi-branch development without cvslines or temporary insanity

[Kaz Kylheku]

On Wed, 16 Jun 2004, Doug Lee wrote:

> What I'm hoping is that somebody out there has a strategy for
> simplifying the process of updating one or more branches (possibly
> including the trunk) from a particular branch (which could be the
> trunk, AFTER a series of commits have been made to that branch.

Meta-CVS contains logic for branch management. When you create a
branch, it adds the necessary tags to keep track of the branch point.

You can merge from a branch to any branch; it uses a separate set of
tags to track the merges for each source-target combination.

This is useful, for instance, if a branch contains the development for
some feature that is of interest on some other branches.

The user does not have to be aware of any tags, just execute commands
that reflect high level branching and merging use cases.

-- 
Meta-CVS: the working replacement for CVS that has been stable for two
years.  It versions the directory structure, symbolic links and execute
permissions. It figures out renaming on import. Plus it babysits the kids
and does light housekeeping! http://freshmeat.net/projects/mcvs