On Thu, Apr 12, 2001 at 11:29:59AM -0400, Noel L Yap wrote:
> [EMAIL PROTECTED] 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).
mrc
--
Mike Castle Life is like a clock: You can work constantly
[EMAIL PROTECTED] and be right all the time, or not work at all
www.netcom.com/~dalgoda/ and be right at least twice a day. -- mrc
We are all of us living in the shadow of Manhattan. -- Watchmen
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
