# Diff of /meta-cvs/F-8F7DAF614BB613A14BEA23D9E52482F5.latex

revision 1.6 by kaz, Mon Jul 29 00:51:34 2002 UTC revision 1.6.4.4 by kaz, Wed Dec 31 06:40:00 2003 UTC
# Line 152  baseline, which will accept a new snapsh Line 152  baseline, which will accept a new snapsh
152
153  The first action that the {\tt create} command takes is to scan the current  The first action that the {\tt create} command takes is to scan the current
154  working directory, and, recursively, all of its subdirectories. It forms  working directory, and, recursively, all of its subdirectories. It forms
155  a list of all regular files, ignoring any device special files, symbolic links  a list of all regular files and symbolic links, ignoring any other
156  and the like. Having thus gathered a list of the files, it identifies all  types of files such as sockets, devices, pipes and the like. Having thus
157  of their {\it suffixes} and collates them to form a list.  gathered a list of the files, it identifies all of their {\it suffixes} and
158    collates them to form a list.
159
160  If none of the files have suffixes, the creation procedure skips to the next  If none of the files have suffixes, the creation procedure skips to the next
161  step. Otherwise, a text editor is invoked in order to allow you to make  step. Otherwise, a text editor is invoked in order to allow you to make
# Line 174  outermost parentheses which enclose the Line 175  outermost parentheses which enclose the
175  elements is itself a list containing a string like {\tt "c"} and the  elements is itself a list containing a string like {\tt "c"} and the
176  symbol {\tt :DEFAULT}. The string represents a file suffix, and the  symbol {\tt :DEFAULT}. The string represents a file suffix, and the
177  symbol indicates how files having that suffix are to be treated.  symbol indicates how files having that suffix are to be treated.
178  In the text editor, you should see instructions which explain the  Above the list, you should see a comment explaining the
179  various keywords which are supported.  The greatest concern is to  various keywords which are supported.  The greatest concern is to
180  identify what files are binary. For example, in the above definition,  identify what files are binary. For example, in the above definition,
181  the treatment of the suffix {\tt .png} should be modified to {\tt :BINARY}  the treatment of the suffix {\tt .png} should be modified to {\tt :BINARY}
# Line 196  case you are interested, that colon is a Line 197  case you are interested, that colon is a
197  that the following name refers to a symbol in the {\tt KEYWORD} package.}  that the following name refers to a symbol in the {\tt KEYWORD} package.}
198
199  Finally, Meta-CVS invokes CVS to create a new module in the repository.  Finally, Meta-CVS invokes CVS to create a new module in the repository.
200  CVS again, brings up a text editor. This time you are expected to enter  CVS also starts a text editor. This time you are expected to enter
201  a log message which will be added to version 1.1 of every new document.  a log message which will be added to version 1.1 of every new document.
202  You are, in fact, interacting with {\tt cvs import}.  You are, in fact, interacting with {\tt cvs import}.
203  \index{CVS!import command@{\tt import} command}  \index{CVS!import command@{\tt import} command}
# Line 239  hexadecimal digits and an optional suffi Line 240  hexadecimal digits and an optional suffi
240  the sandbox through {\it hard links}.  the sandbox through {\it hard links}.
242  That is to say, each of the F-files  That is to say, each of the F-files
243  which appear under the {\tt MCVS} directory  also exist in some other  which appears under the {\tt MCVS} directory  also exists in some other
244  directory within your sandbox. This arrangement is possible because your  directory within your sandbox. This arrangement is possible because your
245  operating system allows a file object to be referenced by more than one  operating system allows a file object to be referenced by more than one
246  directory entry. Directories are nothing more than lists which link names to  directory entry. Directories are nothing more than lists which link names to
# Line 277  which means that the directory structure Line 278  which means that the directory structure
278  like the contents of its files. Changing the name or location of  like the contents of its files. Changing the name or location of
279  a file is effectively just another edit that is commited to the repository.  a file is effectively just another edit that is commited to the repository.
280
281    Symbolic links are represented purely as special entries in the {tt MAP} file;
282    their contents are not versioned in CVS as independent objects.
283
284  \subsection{Making Changes}  \subsection{Making Changes}
285
286  Now that you have a working copy checked out, you are probably eager  Now that you have a working copy checked out, you are probably eager
# Line 326  introduced for debugging, or some experi Line 330  introduced for debugging, or some experi
330  knows whether it ought to be published to the repository.  Every file that  knows whether it ought to be published to the repository.  Every file that
331  is added under version control initially starts out as a local file. An  is added under version control initially starts out as a local file. An
332  explicit {\tt add} command must be invoked to cause a local file to become  explicit {\tt add} command must be invoked to cause a local file to become
333  versioned. This is a local change until it is committed to the repository,  versioned. The effect of {\tt add} is a local change until it is committed to
334  at which point the newly added file becomes visible to other sandboxes.  the repository.
335
338  requires additional arguments which specify what files are to be added.  be added.  For exaple, to add the local files {\tt macros.lisp} and {\tt
339  For exaple, to add the local files {\tt macros.lisp} and {\tt README},  README}, issue the command:
issue the command:
340  \begin{verbatim}  \begin{verbatim}
342  \end{verbatim}  \end{verbatim}
# Line 346  and the file {\tt INSTALL}. Line 349  and the file {\tt INSTALL}.
349      mcvs add -R sources documentation INSTALL      mcvs add -R sources documentation INSTALL
350  \end{verbatim}  \end{verbatim}
352  Like the {\tt create} command, the {\tt add} command scans the  Like the {\tt create} command, the {\tt add} command scans the files and
353  files to be added, and computes a list of their suffixes. If there  symbolic links to be added, and computes a list of the suffixes of the files.
354  are any hitherto unknown suffixes in the added set, a text editor  If any hitherto unknown suffixes are discovered, a text editor will
355  will be invoked to allow you to specify the treatment of these  be invoked to allow you to specify the treatment of these files.
files.
356  The effect of {\tt mcvs add} is local; the files aren't incorporated  The effect of {\tt mcvs add} is local; the files aren't incorporated
357  into the repository until a commit takes place.  into the repository until a commit takes place.
358
# Line 397  that differ only in the amount of whites Line 399  that differ only in the amount of whites
399
400  \subsection{Error Recovery}  \subsection{Error Recovery}
401
402    The execution of a Meta-CVS command can encounter a problem situation,
403    or error. For example, suppose that one user adds and commits a file
404    called {\tt parser.c} and then another user performs an update to pull
405    the latest material from the repository. Suppose that the other user
406    already has a local file called {\tt parser.c}. This is identified
407    by Meta-CVS as a problem. There are at least two ways of dealing with
408    this problem. One is to defer the problem: do nothing at all and
409    just terminate, leaving the effect of the update operation incomplete.
410    The next time {\tt mcvs up} is invoked, it will run into the problem again, if
411    the local file still exists. The user has a chance to rename the file
412    out of the way'' and re-try the update. A possible resolution is to
413    overwrite the local file with the one from the repository.
414
415    Errors are divided into two categories: terminating errors and continuable
416    errors. When a terminating errors occurs, Meta-CVS display as error message,
417    and terminates. Termination is always graceful; if some operation is partially
418    done, the partial effects are undone.  A continuable error, by contrast,
419    causes Meta-CVS to prompt the user with a menu of choices.
420
421
422  \appendix  \appendix
# Line 407  that differ only in the amount of whites Line 427  that differ only in the amount of whites
427  documents, which selects a specific version of each document.  documents, which selects a specific version of each document.
428  \index{baseline}  \index{baseline}
429
430  \paragraph{basename} The short name of a file, excluding the fullp path,  \paragraph{basename} The short name of a file, excluding the full path,
431  if any.  For example, the basename of {\tt src/lib/lexer.c} is {\tt lexer.c}.  if any.  For example, the basename of {\tt src/lib/lexer.c} is {\tt lexer.c}.
432  \index{basename}  \index{basename}
433
# Line 445  language constructs. Line 465  language constructs.
465  Meta-CVS.  Meta-CVS.
466  \index{module}  \index{module}
467
468  \paragraph{sandbox} The working copy of your project.  \paragraph{sandbox} The working copy of a module.
469  \index{sandbox}  \index{sandbox}
470
471  \paragraph{stream} An independent line of development, represented in  \paragraph{stream} An independent line of development, represented in

Legend:
 Removed from v.1.6 changed lines Added in v.1.6.4.4