RE: Merge algorithm

[Pyatt, Scott]

I assumed that "cvs update -j..." was using diff3 as well.  However, the behavior that I expect to see is not always consistent or at least not always intuitive.  Although these odd scenarios are rare, they still happen.  In order to better understand how CVS' merge works, I created a myriad of test cases.  I then created the process and tools that allow my company to work on multiple branches.  This was not trivial and continues to be a work in progress.

I agree with Tamas that it would be a lot easier if the merge algorithm was documented.  It would easy the creation of everyone's process and tools as well as give us an indication if the behavior we see is a "bug" or "feature".

Does anyone know for sure if diff3 is called and if not, what is used?  Does anyone know if the algorithm is documented?

Thanks,
-Scott

-----Original Message-----
From: Noel L Yap [mailto:address@hidden]
Sent: Tuesday, March 20, 2001 12:19 PM
To: address@hidden
Cc: address@hidden
Subject: Re: Merge algorithm

I think it just uses diff3.

Noel

address@hidden on 2001.03.19 12:42:26

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

Hi!

I got another question...

Is the merge algorithm used by CVS documented somewhere?
I would really appreciate if someone could point me to it.

Thanks in advance,
Tamas

_______________________________________________
Info-cvs mailing list
address@hidden
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 Chase & Co., its
subsidiaries and affiliates.

_______________________________________________
Info-cvs mailing list
address@hidden
http://mail.gnu.org/mailman/listinfo/info-cvs