Re: Maintaining branches...

[Mike Castle]

On Thu, Jun 14, 2001 at 12:57:30PM -0400, Greg A. Woods wrote:
> [ On Wednesday, June 13, 2001 at 23:12:16 (-0700), Paul Sander wrote: ]
> >  The joins shouldn't be recorded in the
> > repository until the commits are done anyway.
> 
> That's true!
> 
> > -j makes a notation in the CVS directory (or appends an existing one if
> > multiple joins are done between commits), and -r and -A clear out the
> > notations.  At commit time, the notations could be recorded in the RCS
> > files for future use.
> 
> That's the trick.  How do you do that without impacting RCS compatability???
> Is doing it as part of the commit message sufficient?


This can already be accomplished with external scripts that make use of
magic values in commit messages.

And even this, it only handles very special cases of merges.  That is, were
all changes on one branch are merged into another.

And I think that this complete merging happens less than you might think.

It cannot handle the situation where a specific set of changes is migrated
before another (i.e., -j tag1 -j tag2).  It may not even be off of an 
immediate branch, but rather a couple over.

mrc
-- 
     Mike Castle      address@hidden      www.netcom.com/~dalgoda/
    We are all of us living in the shadow of Manhattan.  -- Watchmen
fatal ("You are in a maze of twisty compiler features, all different"); -- gcc