info-cvs
[Top][All Lists]
Advanced

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

Re: Disallowing commits in presence of conflict markers


From: Greg A. Woods
Subject: Re: Disallowing commits in presence of conflict markers
Date: Mon, 16 Jul 2001 17:49:34 -0400 (EDT)

[ On Monday, July 16, 2001 at 16:39:41 (-0400), Noel L Yap wrote: ]
> Subject: Re: Disallowing commits in presence of conflict markers
>
> 
> Can you supply a comment that's more costructive than this, please?

We're talking about source files here.  Yes you can construct a flimsy
argument showing that arbitrary binary data might be "source", but in
the real world only traditional source files need be supported by CVS.

BTW, Here's an excellent definition of "source files":

        a common term used to describe dynamic application text files

        To define a dynamic application text file, we must first define
        text files.  These are files that contain primarily alphanumeric
        characters, including punctuation, but they may also contain
        special characters used to control printing.  These files are
        usually created and modified through the use of a text editor.

        An application text file is a text file created and modified by
        a user for an application, as opposed to special system files
        (which may also be text files), such as /etc/passwd.  When
        application text files reach a point where modifications cease,
        they become static (text) files.  Such files may include
        correspondence, books, and magazine articles.  In the process of
        preparing a letter, we may go through several revisions.
        However once the letter is finished and mailed, the text file
        will probably never be changed.  In this sense it has become a
        static application text file.

        Some application text files continue to undergo periodic cycles
        of modifications such that there are different versions of the
        file.  This type of file we shall call a dynamic application
        text file.  As these files are often sources for programs, they
        are commonly referred to as source files.  Source files however
        are not limited to us in programs; they can also include
        documentation files.

(two points to anyone who can identify the source where I paraphrased
the above definitions from!  ;-)

-- 
                                                        Greg A. Woods

+1 416 218-0098      VE3TCP      <address@hidden>     <address@hidden>
Planix, Inc. <address@hidden>;   Secrets of the Weird <address@hidden>



reply via email to

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