Re: Maintaining branches...

[Mike Castle]

On Wed, Jun 13, 2001 at 10:25:18PM -0400, Ralph Mack wrote:
> Maybe the term "merge" is ambiguous. My concept of a merge is:
> 0. select a reference version and a from and to version
> 1. make a diff from the reference version to the "from" version
> 2. make a diff from the reference version to the "to" version
> 3. merge the diffs (preferably with optional user input), and
> 4. apply the result to the "to" version.
> Does CVS use a different merge concept entirely? 

Not quite, but close:
0. select a reference version and a from and to version
1. make a diff from the reference version to the "from" version
2. apply the diff, as a patch, to the "to" version

They don't even have to have a common ancestor.  It can be any two
versions, and really, in any order (example, maybe you want to back out a
specific set of changes on a particular branch).

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