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.
Noel
[EMAIL PROTECTED] on 2000.10.13 19:14:08
To: [EMAIL PROTECTED]
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?
Thanks,
Chris
--
Chris Hirsch http://www.Tecomac.com
[EMAIL PROTECTED] What? Me Worry? Linux Inside
<INSERT RANDOM WAAAAY COOL QUOTE HERE>
_. _____ __.. .__ ..
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
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.
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
