[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 13:55:12 -0400

address@hidden on 2001.04.12 13:31:41
>On Thu, Apr 12, 2001 at 11:29:59AM -0400, Noel L Yap wrote:
>> address@hidden on 2001.04.12 11:14:55
>> >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?
>Ahhh.  Ok.
>So there'd have to be some protocol that 3 files, and some sort of return
>code and CVS would handle marking up all of the Entries stuff (conflict,
>resolved status, appropriate time stamps, etc).

Yes, although I think the latter part of my email and what Paul had suggested
would be better:
     Allow CVS to use an external diff/merge tool that conforms to some
interface (like the protocol you imply above), instead of having the merge tool
use/call/communicate with 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.

reply via email to

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