[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: |
Wed, 13 Jun 2001 19:59:58 -0700 |
User-agent: |
Mutt/1.3.18i |
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
- Maintaining branches..., Ralph Mack, 2001/06/12
- RE: Maintaining branches..., Stephen Cameron, 2001/06/12
- Re: Maintaining branches..., Ralph Mack, 2001/06/13
- Re: Maintaining branches...,
Mike Castle <=
- Re: Maintaining branches..., Paul Sander, 2001/06/14
- Re: Maintaining branches..., Mike Castle, 2001/06/14
- Re: Maintaining branches..., Paul Sander, 2001/06/14
- Re: Maintaining branches..., Eric Siegerman, 2001/06/14
- Re: Maintaining branches..., Paul Sander, 2001/06/14
- Re: Maintaining branches..., Greg A. Woods, 2001/06/14
- Re: Maintaining branches..., Eric Siegerman, 2001/06/14
- Re: Maintaining branches..., Paul Sander, 2001/06/14
- Re: Maintaining branches..., Mike Castle, 2001/06/14
- Re: Maintaining branches..., Derek R. Price, 2001/06/14