[Top][All Lists]

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

Re: Maintaining branches...

From: Mike Castle
Subject: Re: Maintaining branches...
Date: Thu, 14 Jun 2001 23:13:20 -0700
User-agent: Mutt/1.3.18i

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 as the common contributor.  The other is a single join
> with version
> You could also do this:
> version 1.5 = 1.4 + ( - 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 ->  Then I apply the diff from -> current.  Because I know
I've already applied

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

     Mike Castle      address@hidden
    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

reply via email to

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