Re: Maintaining branches...

[Derek R. Price]

Mike Castle wrote:

> On Thu, Jun 14, 2001 at 03:26:31PM -0400, Derek R. Price wrote:
> > Mike Castle wrote:
> > > 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.
> >
> > What can't it handle about this and why?
>
> Originally I was thinking only highwater marks.
>
> But I guess something like a .newsrc style range/set would work.  (Ok, what
> IS that data structure properly called?)
>
> But consider the following sequence:
>
> branch at 1.1.  Branch has 1.1.0.1 and 1.1.0.2.

I'm going to pretend these are valid branch version numbers for the sake of
argument.


> 1.1.0.3 is made, and that particular change is needed immediately on the
> branch branch, so only it is moved over.  So 1.2 == 1.1 + 1.1.0.3.

I'd probably call this 1.1 + 1.1.0.2->1.1.0.3.  And it would really mean 1.1
+ 1.1.0.2->1.1.0.3 + X, where X is some arbitrary set of changes (possibly null,
possibly including conflict resolution).  Assuming the ancestor won't always
provide all the needed information.



> Changes 1.1.0.4 and 1.1.0.5 are made.  Now we want to migrate all of those
> changes onto the main branch.
>
> So now we have to be able to tell cvs to:
>
> diff -r1.1 -r1.1.0.2, apply patch

> diff -r1.1.0.3 -r1.1.0.5, apply patch

I thought the idea here was that you could say "merge branch 1.1.0" and CVS 
would
say, "you already merged change A on DATE - (s)kip this portion or (r)emerge?"

Derek

--
Derek Price                      CVS Solutions Architect ( http://CVSHome.org )
mailto:address@hidden         CollabNet ( http://collab.net )
--
I will not bring sheep to class.
I will not bring sheep to class.
I will not bring sheep to class...

          - Bart Simpson on chalkboard, _The Simpsons_