Re: Maintaining branches...

[Mike Castle]

On Thu, Jun 14, 2001 at 10:15:16PM -0700, Paul Sander wrote:
> Your first case is really two merges, one requiring the user to supply
> version 1.1.0.3 as the common contributor.  The other is a single join
> with version 1.1.0.2.
> 
> You could also do this:
> 
> version 1.5 = 1.4 + ( 1.1.0.5 - 1.1 )
> 
> And then resolve the inevitable conflicts resulting from the first bug-fix
> merge.  This is how CVS currently works.


Two points:  If I do that manually, I can easily avoid having to deal with
a conflict by doing it in multiple stages.

When I want to merge all the things in, I merge in the diff from 1.1 ->
1.1.0.2.  Then I apply the diff from 1.1.0.3 -> current.  Because I know
I've already applied 1.1.0.3.

If you're going to automate this, this is how I would expect the automation
to work.

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