[Top][All Lists]

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

Re: CVS Merge Algorithm

From: Noel L Yap
Subject: Re: CVS Merge Algorithm
Date: Sun, 15 Oct 2000 08:23:17 -0400

AFAIK, CVS uses diff3.  For example, when merging two versions, it just:
     diff3 -E to_version ancestor from_version;
     echo w;
     echo q;
) | ed - to_version

I may have gotten some details mixed up, so experiment.


address@hidden on 2000.10.13 19:14:08

To:   address@hidden
cc:   (bcc: Noel L Yap)
Subject:  CVS Merge Algorithm

Hey all..I'm sure this is in a FAQ somewhere because I thought I saw it
once. I'm trying to enlighten my team about the ways of CVS and when I said
it can automatically merge code alarm bells went off all around. I'm sure
many of you have been through this before ;-) Is there a whitepaper on the
CVS merge algorithm and a statistics page about false positives and error
percentages when using the automatic merge?


Chris Hirsch                             

address@hidden                          What?  Me Worry?  Linux Inside
                                                     _. _____ __.. .__ ..

Info-cvs mailing list

This communication is for informational purposes only.  It is not intended as
an offer or solicitation for the purchase or sale of any financial instrument
or as an official confirmation of any transaction. All market prices, data
and other information are not warranted as to completeness or accuracy and
are subject to change without notice. Any comments or statements made herein
do not necessarily reflect those of J.P. Morgan & Co. Incorporated, its
subsidiaries and affiliates.

reply via email to

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