[Top][All Lists]

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

Re: CVS bashing?

From: Noel L Yap
Subject: Re: CVS bashing?
Date: Thu, 12 Apr 2001 11:29:59 -0400

address@hidden on 2001.04.12 11:14:55
>On Thu, Apr 12, 2001 at 11:05:51AM -0400, Noel L Yap wrote:
>> If a wrapper tool were used, it would necessarily have to munge around the
>> CVS/Entries file which is supposed to be internal to CVS (eg its
>> could change or it could disappear altogether in the future).
>I thought we were talking about a generic tool that would do a merge for
>any arbitrary file and save it to disk.  What needs to use CVS/Entries?

Should CVS be told about the merge?

For example, AFAIK, CVS changes some info in CVS/Entries to keep (partial) track
of merges and conflicts.  A generic merge tool shouldn't subvert this mechanism.

Or, maybe I misunderstood you and you meant that a generic and separate merge
tool should be created that's used by CVS.  If this is so, then I would agree.


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.

reply via email to

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