[Top][All Lists]

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

Re: CVS bashing?

From: Mike Castle
Subject: Re: CVS bashing?
Date: Thu, 12 Apr 2001 10:31:41 -0700
User-agent: Mutt/1.3.6i

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).

       Mike Castle       Life is like a clock:  You can work constantly
  address@hidden  and be right all the time, or not work at all and be right at least twice a day.  -- mrc
    We are all of us living in the shadow of Manhattan.  -- Watchmen

reply via email to

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