[Top][All Lists]

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

Re: How well does CVS handle other types of data?

From: Mike Castle
Subject: Re: How well does CVS handle other types of data?
Date: Sat, 14 Jul 2001 11:52:48 -0700
User-agent: Mutt/1.3.18i

On Sat, Jul 14, 2001 at 02:07:58PM -0400, Greg A. Woods wrote:
> > The existing warning of a conflict during the merge is sufficient to
> > alert the user to a possible problem.
> No, it is not.  The initial warning is only just that -- an initial
> warning.  CVS must now continue to detect that the conflict remains
> until it has been explicitly resolved and in the mean time avoid doing
> anything further that will "damage" the file.

Except that CVS doesn't continue to detect conflicts.  A simple touch(1) of
the file is sufficient to mark the file as "fixed."  And that will work on
any file type.

     Mike Castle      address@hidden
    We are all of us living in the shadow of Manhattan.  -- Watchmen
fatal ("You are in a maze of twisty compiler features, all different"); -- gcc

reply via email to

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