annotate doc/misc/pcl-cvs.texi @ 98036:70619fdc3dac

*** empty log message ***
author Eli Zaretskii <eliz@gnu.org>
date Sat, 06 Sep 2008 13:43:36 +0000
parents ce35dd677448
children 6de181810d0f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
84309
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1 \input texinfo @c -*-texinfo-*-
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
2 @c %**start of header
84329
3d431f1997d8 (setfilename): Go up one more level to ../../info.
Glenn Morris <rgm@gnu.org>
parents: 84309
diff changeset
3 @setfilename ../../info/pcl-cvs
84309
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
4 @settitle PCL-CVS --- Emacs Front-End to CVS
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
5 @syncodeindex vr fn
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
6 @c %**end of header
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
7
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
8 @copying
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
9 Copyright @copyright{} 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
87903
5d58981e6690 Merge from emacs--rel--22
Miles Bader <miles@gnu.org>
parents: 84329
diff changeset
10 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
5d58981e6690 Merge from emacs--rel--22
Miles Bader <miles@gnu.org>
parents: 84329
diff changeset
11 Free Software Foundation, Inc.
84309
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
12
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
13 @quotation
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
14 Permission is granted to copy, distribute and/or modify this document
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
15 under the terms of the GNU Free Documentation License, Version 1.2 or
95936
ce35dd677448 Remove references to external license, since doclicense is included.
Glenn Morris <rgm@gnu.org>
parents: 95874
diff changeset
16 any later version published by the Free Software Foundation; with no
ce35dd677448 Remove references to external license, since doclicense is included.
Glenn Morris <rgm@gnu.org>
parents: 95874
diff changeset
17 Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
ce35dd677448 Remove references to external license, since doclicense is included.
Glenn Morris <rgm@gnu.org>
parents: 95874
diff changeset
18 and with the Back-Cover Texts as in (a) below. A copy of the license
ce35dd677448 Remove references to external license, since doclicense is included.
Glenn Morris <rgm@gnu.org>
parents: 95874
diff changeset
19 is included in the section entitled ``GNU Free Documentation License''.
84309
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
20
95874
eafbd7a5c9be Update Back-Cover Text as per maintain.info.
Glenn Morris <rgm@gnu.org>
parents: 93217
diff changeset
21 (a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
eafbd7a5c9be Update Back-Cover Text as per maintain.info.
Glenn Morris <rgm@gnu.org>
parents: 93217
diff changeset
22 modify this GNU manual. Buying copies from the FSF supports it in
eafbd7a5c9be Update Back-Cover Text as per maintain.info.
Glenn Morris <rgm@gnu.org>
parents: 93217
diff changeset
23 developing GNU and promoting software freedom.''
84309
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
24 @end quotation
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
25 @end copying
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
26
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
27 @dircategory Emacs
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
28 @direntry
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
29 * PCL-CVS: (pcl-cvs). Emacs front-end to CVS.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
30 @end direntry
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
31
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
32 @c The titlepage section does not appear in the Info file.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
33 @titlepage
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
34 @sp 4
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
35 @c The title is printed in a large font.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
36 @center @titlefont{User's Guide}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
37 @sp
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
38 @center @titlefont{to}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
39 @sp
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
40 @center @titlefont{PCL-CVS --- The Emacs Front-End to CVS}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
41 @ignore
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
42 @sp 2
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
43 @center release 2.9
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
44 @c -release-
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
45 @end ignore
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
46 @sp 3
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
47 @center Per Cederqvist
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
48 @center Stefan Monnier
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
49 @c -date-
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
50
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
51 @c The following two commands start the copyright page
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
52 @c for the printed manual. This will not appear in the Info file.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
53 @page
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
54 @vskip 0pt plus 1filll
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
55 @insertcopying
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
56 @end titlepage
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
57
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
58 @c ================================================================
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
59 @c The real text starts here
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
60 @c ================================================================
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
61
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
62 @node Top, About PCL-CVS, (dir), (dir)
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
63 @ifnottex
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
64 @top PCL-CVS
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
65
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
66 This manual describes PCL-CVS, the GNU Emacs front-end to CVS. It
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
67 is nowhere near complete, so you are advised to use @kbd{M-x
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
68 customize-group RET pcl-cvs @key{RET}} and to look at the documentation strings
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
69 of the various commands and major modes for further information.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
70 @c This manual is updated to release 2.5 of PCL-CVS.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
71 @end ifnottex
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
72
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
73 @menu
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
74 * About PCL-CVS:: Credits, history, @dots{}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
75
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
76 * Getting started:: An introduction with a walk-through example.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
77 * Buffer contents:: An explanation of the buffer contents.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
78 * Selected files:: To which files are commands applied.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
79 * Commands:: All commands, grouped by type.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
80
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
81 * Log Edit Mode:: Major mode to edit log messages.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
82 * Log View Mode:: Major mode to browse log changes.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
83 @c * CVS Status Mode:: Major mode to view CVS' status output.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
84 * Customization:: How you can tailor PCL-CVS to suit your needs.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
85 * Bugs:: Bugs (known and unknown).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
86
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
87 * GNU Free Documentation License:: The license for this documentation.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
88 * Function and Variable Index:: List of functions and variables.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
89 * Concept Index:: List of concepts.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
90 * Key Index:: List of keystrokes.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
91
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
92 @detailmenu
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
93 --- The Detailed Node Listing ---
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
94
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
95 About PCL-CVS
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
96
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
97 * Contributors:: Contributors to PCL-CVS.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
98
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
99 Commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
100
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
101 * Entering PCL-CVS:: Commands to invoke PCL-CVS
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
102 * Setting flags:: Setting flags for CVS commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
103 * Updating the buffer::
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
104 * Movement commands:: How to move up and down in the buffer
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
105 * Marking files:: How to mark files that other commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
106 will later operate on.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
107 * Committing changes:: Checking in your modifications to the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
108 CVS repository.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
109 * Editing files:: Loading files into Emacs.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
110 * Getting info about files:: Display the log and status of files.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
111 * Adding and removing files:: Adding and removing files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
112 * Undoing changes:: Undoing changes
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
113 * Removing handled entries:: Uninteresting lines can easily be removed.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
114 * Ignoring files:: Telling CVS to ignore generated files.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
115 * Viewing differences:: Commands to @samp{diff} different versions.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
116 * Invoking Ediff:: Running @samp{ediff} from @samp{*cvs*} buffer.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
117 * Updating files:: Updating files that Need-update.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
118 * Tagging files:: Tagging files.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
119 * Miscellaneous commands:: Miscellaneous commands.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
120
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
121 Customization
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
122
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
123 * Customizing Faces::
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
124
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
125 @end detailmenu
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
126 @end menu
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
127
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
128 @node About PCL-CVS, Getting started, Top, Top
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
129 @chapter About PCL-CVS
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
130 @cindex About PCL-CVS
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
131
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
132 PCL-CVS is a front-end to CVS versions 1.9 and later.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
133 It concisely shows the present status of a checked out module in an
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
134 Emacs buffer and provides single-key access to the most frequently used CVS
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
135 commands.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
136 For Emacs users accustomed to VC, PCL-CVS can be thought of as a replacement
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
137 for VC-dired (@pxref{VC Dired Mode, , Dired under VC, emacs, The GNU
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
138 Emacs Manual}) specifically designed for CVS.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
139
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
140 PCL-CVS was originally written many years ago by Per Cederqvist who
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
141 proudly maintained it until January 1996, at which point he released the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
142 beta version 2.0b2 and passed on the maintainership to Greg A Woods.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
143 Development stayed mostly dormant for a few years during which
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
144 version 2.0 never seemed to be able to leave the ``beta'' stage while a
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
145 separate XEmacs version was slowly splitting away. In late 1998,
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
146 Stefan Monnier picked up development again, adding some major new
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
147 functionality and taking over the maintenance.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
148
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
149 @menu
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
150 * Contributors:: Contributors to PCL-CVS.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
151 @end menu
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
152
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
153 @node Contributors,, About PCL-CVS, About PCL-CVS
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
154 @section Contributors to PCL-CVS
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
155 @cindex Contributors
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
156 @cindex Authors
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
157
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
158 Contributions to the package are welcome. I have limited time to work
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
159 on this project, but I will gladly add any code that you contribute to
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
160 me to this package (@pxref{Bugs}).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
161
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
162 The following persons have made contributions to PCL-CVS.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
163
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
164 @itemize @bullet
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
165 @item
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
166 Brian Berliner wrote CVS, together with some other contributors.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
167 Without his work on CVS this package would be useless@dots{}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
168
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
169 @item
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
170 Per Cederqvist wrote most of the otherwise unattributed functions in
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
171 PCL-CVS as well as all the documentation.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
172
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
173 @item
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
174 @email{inge@@lysator.liu.se, Inge Wallin} wrote the skeleton of
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
175 @file{pcl-cvs.texi}, and gave useful comments on it. He also wrote
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
176 the files @file{elib-node.el} and @file{compile-all.el}. The file
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
177 @file{cookie.el} was inspired by Inge.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
178
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
179 @item
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
180 @email{linus@@lysator.liu.se, Linus Tolke} contributed useful comments
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
181 on both the functionality and the documentation.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
182
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
183 @item
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
184 @email{jwz@@jwz.com, Jamie Zawinski} contributed
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
185 @file{pcl-cvs-lucid.el}, which was later renamed to
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
186 @file{pcl-cvs-xemacs.el}.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
187
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
188 @item
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
189 Leif Lonnblad contributed RCVS support (since superseded by the new
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
190 remote CVS support).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
191
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
192 @item
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
193 @email{jimb@@cyclic.com, Jim Blandy} contributed hooks to automatically
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
194 guess CVS log entries from @file{ChangeLog} contents, and initial support of
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
195 the new Cygnus / Cyclic remote CVS, as well as various sundry bug fixes
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
196 and cleanups.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
197
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
198 @item
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
199 @email{kingdon@@cyclic.com, Jim Kingdon} contributed lots of fixes to
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
200 the build and installation procedure.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
201
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
202 @item
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
203 @email{woods@@weird.com, Greg A.@: Woods} contributed code to implement
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
204 the use of per-file diff buffers, and vendor join diffs with emerge and
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
205 ediff, as well as various and sundry bug fixes and cleanups.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
206
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
207 @item
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
208 @email{greg.klanderman@@alum.mit.edu, Greg Klanderman} implemented
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
209 toggling of marked files, setting of CVS command flags via prefix
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
210 arguments, updated the XEmacs support, updated the manual, and fixed
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
211 numerous bugs.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
212
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
213 @item
93217
e9fe0099fac2 (Contributors): Update my email.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87903
diff changeset
214 @email{monnier@@gnu.org, Stefan Monnier} added a slew of other
84309
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
215 features and introduced even more new bugs. If there's any bug left,
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
216 you can be sure it's his.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
217
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
218 @item
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
219 @c wordy to avoid an underfull hbox
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
220 @email{masata-y@@is.aist-nara.ac.jp, Masatake YAMATO} made a gracious
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
221 contribution of his cvstree code to display a tree of tags which was later
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
222 superseded by the new @code{cvs-status-mode}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
223 @end itemize
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
224
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
225 Apart from these, a lot of people have sent us suggestions, ideas,
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
226 requests, bug reports and encouragement. Thanks a lot! Without you
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
227 there would be no new releases of PCL-CVS.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
228
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
229
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
230 @node Getting started, Buffer contents, About PCL-CVS, Top
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
231 @chapter Getting started
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
232 @cindex Introduction
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
233 @cindex Example run
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
234 @cindex Sample session
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
235
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
236 This document assumes that you know what CVS is, and that you at least
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
237 know the fundamental concepts of CVS. If that is not the case, you
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
238 should read the CVS documentation. Type @kbd{info -f cvs} or @kbd{man
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
239 cvs}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
240
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
241 PCL-CVS is only useful once you have checked out a module. So before
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
242 you invoke it, you must have a copy of a module somewhere in the file
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
243 system.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
244
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
245 You can invoke PCL-CVS by typing @kbd{M-x cvs-examine @key{RET}}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
246 You can also invoke it via the menu bar, under @samp{Tools}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
247 Or, if you prefer, you can also invoke PCL-CVS by simply visiting the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
248 CVS administrative subdirectory of your module, with a prefix argument.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
249 For example, to invoke PCL-CVS in a separate frame, type @kbd{C-u C-x 5
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
250 f ~/my/project/CVS @key{RET}}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
251
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
252 The function @code{cvs-examine} will ask for a directory. The command
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
253 @samp{cvs -n update} will be run in that directory. (It should contain
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
254 files that have been checked out from a CVS archive.) The output from
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
255 @code{cvs} will be parsed and presented in a table in a buffer called
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
256 @samp{*cvs*}. It might look something like this:
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
257
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
258 @example
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
259 Repository : /usr/CVSroot
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
260 Module : test
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
261 Working dir: /users/ceder/FOO/test
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
262
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
263
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
264 In directory .:
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
265 Need-Update bar
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
266 Need-Update file.txt
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
267 Modified namechange
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
268 Need-Update newer
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
269 In directory sub:
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
270 Modified ChangeLog
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
271
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
272 --------------------- End ---------------------
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
273 -- last cmd: cvs -f -z6 -n update -d -P --
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
274 @end example
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
275
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
276 In this example, your repository is in @file{/usr/CVSroot} and CVS has
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
277 been run in the directory @file{/users/ceder/FOO/test}. The three files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
278 (@file{bar}, @file{file.txt} and
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
279 @file{newer}) that are marked with @samp{Need-Update} have been changed
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
280 by someone else in the CVS repository. Two files (@file{namechange}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
281 and @file{sub/ChangeLog}) have been modified locally, and need to be
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
282 checked in.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
283
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
284 You can move the cursor up and down in the buffer with @kbd{C-n} and
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
285 @kbd{C-p} or @kbd{n} and @kbd{p}. If you press @kbd{c} on one of the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
286 @samp{Modified} files, that file will be checked in to the CVS
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
287 repository. @xref{Committing changes}. You can also press @kbd{O} to
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
288 update any of the files that are marked @samp{Need-Update}. You can
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
289 also run @kbd{M-x cvs-update @key{RET}} (bound to @kbd{M-u} in the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
290 @samp{*cvs*} buffer) to update all the files.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
291
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
292 You can then press @kbd{=} to easily get a @samp{diff} between your
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
293 modified file and the base version that you started from, or you can
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
294 press @kbd{l} to get the output from @samp{cvs log}. Many more such
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
295 commands are available simply by pressing a key (@pxref{Getting info
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
296 about files}).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
297
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
298 @node Buffer contents, Selected files, Getting started, Top
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
299 @chapter Buffer contents
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
300 @cindex Buffer contents
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
301 @cindex @code{*cvs*} buffer contents
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
302
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
303 The display contains several columns, some of which are optional.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
304 These columns are, from left to right:
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
305
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
306 @itemize @bullet
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
307
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
308 @item
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
309 Optionally, the head revision of the file. This is the latest version
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
310 found in the repository. It might also contain (instead of the head
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
311 revision) a sub status which typically gives further information about
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
312 how we got to the current state, for example @samp{patched},
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
313 @samp{merged}, @dots{}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
314
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
315 @item
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
316 An asterisk when the file is @dfn{marked} (@pxref{Selected
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
317 files}).@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
318
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
319 @item
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
320 The actual status of the file wrt the repository. See below.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
321
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
322 @item
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
323 Optionally, the base revision of the file. This is the version
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
324 which the copy in your working directory is based upon.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
325
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
326 @item
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
327 The file name.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
328
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
329 @end itemize
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
330
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
331 The @samp{file status} field can have the following values:
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
332
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
333 @table @samp
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
334 @item Modified
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
335 The file is modified in your working directory, and there was no
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
336 modification to the same file in the repository. This status can have
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
337 the following substatus:
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
338
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
339 @table @samp
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
340 @item merged
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
341 The file was modified in your working directory, and there were
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
342 modifications in the repository as well, but they were merged
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
343 successfully, without conflict, in your working directory.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
344 @end table
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
345
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
346 @item Conflict
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
347 A conflict was detected while trying to merge your changes to @var{file}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
348 with changes from the repository. @var{file} (the copy in your
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
349 working directory) is now the output of the @code{rcsmerge} command on
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
350 the two versions; an unmodified copy of your file is also in your
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
351 working directory, with the name @file{.#@var{file}.@var{version}},
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
352 where @var{version} is the RCS revision that your modified file started
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
353 from. @xref{Viewing differences}, for more details.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
354
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
355 A conflict can also come from a disagreement on the existence of the file
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
356 rather than on its content. This case is indicated by the following
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
357 possible substatus:
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
358
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
359 @table @samp
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
360 @item removed
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
361 The file is locally removed but a new revision has been committed to
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
362 the repository by someone else.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
363
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
364 @item added
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
365 The file is locally added and has also been added to the repository
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
366 by someone else.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
367
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
368 @item modified
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
369 The file is locally modified but someone else has removed it from the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
370 repository.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
371 @end table
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
372
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
373 @item Added
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
374 The file has been added by you, but it still needs to be checked in to
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
375 the repository.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
376
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
377 @item Removed
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
378 The file has been removed by you, but it still needs to be checked in to
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
379 the repository. You can resurrect it by typing @kbd{a} (@pxref{Adding
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
380 and removing files}).@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
381
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
382 @item Unknown
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
383 A file that was detected in your directory, but that neither appears in
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
384 the repository, nor is present on the list of files that CVS should
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
385 ignore.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
386
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
387 @item Up-to-date
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
388 The file is up to date with respect to the version in the repository.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
389 This status can have a substatus of:
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
390
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
391 @table @samp
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
392 @item added
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
393 You have just added the file to the repository.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
394
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
395 @item updated
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
396 The file was brought up to date with respect to the repository. This is
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
397 done for any file that exists in the repository but not in your source,
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
398 and for files that you haven't changed but are not the most recent
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
399 versions available in the repository.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
400
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
401 @item patched
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
402 The file was brought up to date with respect to the remote repository by
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
403 way of fetching and applying a patch to the file in your source. This
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
404 is equivalent to @samp{updated} except that CVS decided to use a hopefully
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
405 more efficient method.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
406
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
407 @item committed
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
408 You just committed the file.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
409 @end table
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
410
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
411 @item Need-Update
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
412 Either a newer version than the one in your source is available in the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
413 repository and you have not modified your checked out version, or the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
414 file exists in the repository but not in your source. Use
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
415 @samp{cvs-mode-update} bound to @kbd{O} to update the file.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
416
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
417 @item Need-Merge
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
418 You have modified the checked out version of the file, and a newer
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
419 version is available in the repository. A merge will take place when
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
420 you run a @samp{cvs-update}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
421
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
422 @item Missing
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
423 The file has been unexpectedly removed from your working directory
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
424 although it has not been @samp{cvs remove}d.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
425 @end table
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
426
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
427 @node Selected files, Commands, Buffer contents, Top
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
428 @chapter Selected files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
429 @cindex Selected files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
430 @cindex Marked files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
431 @cindex File selection
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
432 @cindex Active files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
433 @cindex Applicable
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
434
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
435 Many of the commands work on the current set of @dfn{selected} files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
436 which can be either the set of marked files (if any file is marked and
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
437 marks are not ignored) or whichever file or directory the cursor is on.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
438
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
439 If a directory is selected but the command cannot be applied to a
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
440 directory, then it will be applied to the set of files under this
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
441 directory which are in the @samp{*cvs*} buffer.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
442
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
443 @findex cvs-mode-force-command
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
444 @findex cvs-allow-dir-commit
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
445 Furthermore, each command only operates on a subset of the selected
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
446 files, depending on whether or not the command is @dfn{applicable} to
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
447 each file (based on the file's status). For example,
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
448 @code{cvs-mode-commit} is not applicable to a file whose status is
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
449 @samp{Need-Update}. If it should happen that PCL-CVS guesses the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
450 applicability wrong, you can override it with the special prefix
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
451 @code{cvs-mode-force-command} normally bound to @kbd{M-f} (and file a
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
452 bug report). The applicability rule can be slightly changed with
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
453 @code{cvs-allow-dir-commit} and @code{cvs-force-dir-tag}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
454
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
455 By default, marks are always in effect (you may change this, however, by
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
456 setting the variable @code{cvs-default-ignore-marks}) except for the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
457 commands that @samp{tag} or @samp{diff} a file (which can be changed
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
458 with the variable @code{cvs-invert-ignore-marks}).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
459
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
460 In addition, you may use the special prefix @code{cvs-mode-toggle-marks}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
461 normally bound to @key{T} to toggle the use of marks for the following
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
462 command.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
463
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
464 This scheme might seem a little complicated, but once one gets used to
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
465 it, it is quite powerful.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
466
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
467 For commands to mark and unmark files, see @ref{Marking files}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
468
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
469 @node Commands, Log Edit Mode, Selected files, Top
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
470 @chapter Commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
471
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
472 @iftex
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
473 This chapter describes all the commands that you can use in PCL-CVS.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
474 @end iftex
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
475 @ifnottex
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
476 The nodes in this menu contains explanations about all the commands that
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
477 you can use in PCL-CVS. They are grouped together by type.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
478 @end ifnottex
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
479
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
480 @menu
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
481 * Entering PCL-CVS:: Commands to invoke PCL-CVS
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
482 * Setting flags:: Setting flags for CVS commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
483 * Updating the buffer::
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
484 * Movement commands:: How to move up and down in the buffer
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
485 * Marking files:: How to mark files that other commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
486 will later operate on.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
487 * Committing changes:: Checking in your modifications to the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
488 CVS repository.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
489 * Editing files:: Loading files into Emacs.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
490 * Getting info about files:: Display the log and status of files.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
491 * Adding and removing files:: Adding and removing files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
492 * Undoing changes:: Undoing changes
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
493 * Removing handled entries:: Uninteresting lines can easily be removed.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
494 * Ignoring files:: Telling CVS to ignore generated files.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
495 * Viewing differences:: Commands to @samp{diff} different versions.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
496 * Invoking Ediff:: Running @samp{ediff} from @samp{*cvs*} buffer.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
497 * Updating files:: Updating files that Need-update.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
498 * Tagging files:: Tagging files.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
499 * Miscellaneous commands:: Miscellaneous commands.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
500 @end menu
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
501
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
502
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
503 @node Entering PCL-CVS, Setting flags, Commands, Commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
504 @section Entering PCL-CVS
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
505 @findex cvs-update
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
506 @findex cvs-examine
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
507 @findex cvs-status
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
508 @findex cvs-checkout
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
509 @findex cvs-quickdir
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
510 @cindex Creating the *cvs* buffer
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
511
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
512 Most commands in PCL-CVS require that you have a @samp{*cvs*}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
513 buffer. The commands that you use to get one are listed below.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
514 For each, a @samp{cvs} process will be run, the output will be parsed by
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
515 PCL-CVS, and the result will be printed in the @samp{*cvs*} buffer (see
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
516 @ref{Buffer contents}, for a description of the buffer's contents).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
517
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
518 @table @kbd
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
519 @item M-x cvs-update
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
520 Run a @samp{cvs update} command. You will be asked for the directory
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
521 in which the @samp{cvs update} will be run.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
522
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
523 @item M-x cvs-examine
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
524 Run a @samp{cvs -n update} command. This is identical to the previous
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
525 command, except that it will only check what needs to be done but will
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
526 not change anything. You will be asked for the directory in
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
527 which the @samp{cvs -n update} will be run.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
528
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
529 @item M-x cvs-status
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
530 Run a @samp{cvs status} command. You will be asked for the directory
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
531 in which the @samp{cvs status} will be run.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
532
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
533 @item M-x cvs-checkout
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
534 Run a @samp{cvs checkout} command. You will be asked for the directory
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
535 in which the @samp{cvs update} will be run and the module to be checked
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
536 out.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
537
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
538 @item M-x cvs-quickdir
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
539 Populate the @samp{*cvs*} buffer by just looking at the @file{CVS/Entries}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
540 files. This is very much like @code{cvs-examine} except that it does
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
541 not access the CVS repository, which is a major advantage when the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
542 repository is far away. But of course, it will not be able to detect
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
543 when a file needs to be updated or merged.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
544 @end table
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
545
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
546 @findex cvs-dired-action
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
547 @findex cvs-dired-use-hook
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
548 The first four of
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
549 those commands are also reachable from the menu bar
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
550 under @samp{Tools->PCL-CVS}. Finally, an alternative way is to visit
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
551 the CVS administrative subdirectory in your work area with a simple
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
552 prefix argument. For example @kbd{C-u C-x C-f ~/my/work/CVS @key{RET}}. This
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
553 by default runs @code{cvs-quickdir} but the specific behavior can be
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
554 changed with @code{cvs-dired-action} and @code{cvs-dired-use-hook}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
555
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
556 By default, the commands above will descend recursively into
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
557 subdirectories. You can avoid that behavior by including @samp{-l} in
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
558 the flags for the command. These flags can be set by giving a prefix
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
559 argument to the command (e.g., by typing
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
560 @kbd{C-u M-x cvs-update @key{RET} -l @key{RET}}).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
561
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
562
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
563 @node Setting flags, Updating the buffer, Entering PCL-CVS, Commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
564 @section Setting flags for CVS commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
565 @cindex Optional switches to CVS
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
566 @cindex Command-line options to CVS
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
567
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
568 This section describes the convention used by nearly all PCL-CVS
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
569 commands for setting optional flags sent to CVS. A single @kbd{C-u}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
570 prefix argument is used to cause the command to prompt for flags to be
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
571 used for the current invocation of the command only. Two @kbd{C-u} prefix
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
572 arguments are used to prompt for flags which will be set permanently, for the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
573 current invocation and all that follow, until the flags are changed, or
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
574 unless temporary flags are set which override them.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
575
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
576 Perhaps an example or two is in order. Say you are about to add a
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
577 binary file to the repository, and want to specify the flags @samp{-kb}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
578 to @samp{cvs add}. You can type @kbd{C-u a -kb @key{RET}},
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
579 and the file will be added. Subsequent @samp{cvs add}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
580 commands will use the previously prevailing flags.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
581
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
582 As a second example, say you are about to perform a diff and want to see
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
583 the result in unified diff format, i.e. you'd like to pass the flag
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
584 @samp{-u} to both @samp{cvs diff} and @samp{diff}. You'd also like all
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
585 subsequent diffs to use this flag. You can type @kbd{C-u C-u = -u @key{RET}}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
586 and the diff will be performed, and the default flags will be set to
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
587 @code{("-u")}. You can of course override this flag for a single diff
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
588 by using a single @kbd{C-u} prefix argument.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
589
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
590 @cindex Special prefix
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
591 In addition to this, some commands can take @dfn{special prefix} arguments.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
592 These work as follows: When called with a @kbd{C-u} prefix, the user is
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
593 prompted for a new value of the special prefix and the special prefix is
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
594 activated for the next command. When called without the @kbd{C-u}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
595 prefix, the special prefix is re-activated (with the same value as last
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
596 time) for the next command. Calling the prefix command again when it's
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
597 already activated deactivates it. Calling it with the @kbd{C-u C-u}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
598 prefix activates it for all subsequent commands until you deactivate it
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
599 explicitly. The special prefixes are:
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
600
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
601 @table @kbd
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
602 @item T
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
603 Toggles whether or not marks will be active in the next command.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
604
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
605 @item b
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
606 Provide the next command with a branch (can be any version
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
607 specifier) to work on.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
608
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
609 @item B
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
610 Secondary branch argument. Only meaningful if @kbd{b} is also used.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
611 It can be used to provide a second branch argument to
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
612 @code{cvs-mode-diff} or to @code{cvs-mode-update}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
613
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
614 @item M-f
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
615 Forces the next command to apply to every selected file rather than only
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
616 to the ones PCL-CVS thinks are relevant.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
617 @end table
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
618
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
619 @node Updating the buffer, Movement commands, Setting flags, Commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
620 @section Updating the @samp{*cvs*} buffer
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
621 @findex cvs-update
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
622 @findex cvs-examine
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
623 @findex cvs-status
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
624 @findex cvs-mode-update
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
625 @findex cvs-mode-examine
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
626 @findex cvs-mode-status
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
627
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
628 The following commands can be used from within the @samp{*cvs*} buffer
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
629 to update the display:
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
630
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
631 @table @kbd
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
632 @item M-u
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
633 Runs the command @samp{cvs-update}.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
634
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
635 @item M-e
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
636 Runs the command @samp{cvs-examine}.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
637
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
638 @item M-s
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
639 Runs the command @samp{cvs-status}.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
640 @end table
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
641
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
642 In addition to the above commands which operate on the whole module,
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
643 you can run the equivalent CVS command on just a subset of the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
644 files/directories with these keys:
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
645
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
646 @table @kbd
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
647 @item O
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
648 Runs @code{cvs-mode-update} on the selected files. When run on the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
649 top-level directory, this is equivalent to @kbd{M-u}.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
650
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
651 @item e
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
652 Runs @code{cvs-mode-examine} on the selected files. When run on the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
653 top-level directory, this is equivalent to @kbd{M-e}.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
654
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
655 @findex cvs-status-mode
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
656 @item s
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
657 Runs @code{cvs-mode-status} on the selected files. When run on the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
658 top-level directory, this is equivalent to @kbd{M-s}, except that
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
659 CVS output will be shown in a @samp{*cvs-info*} buffer that will be
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
660 put in @samp{cvs-status-mode}.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
661 @end table
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
662
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
663
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
664 @node Movement commands, Marking files, Updating the buffer, Commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
665 @section Movement Commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
666 @cindex Movement Commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
667 @findex cvs-mode-next-line
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
668 @findex cvs-mode-previous-line
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
669 @kindex SPC@r{--Move down one file}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
670 @kindex n@r{--Move down one file}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
671 @kindex p@r{--Move up one file}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
672
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
673 You can use most normal Emacs commands to move forward and backward in
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
674 the buffer. Some keys are rebound to functions that take advantage of
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
675 the fact that the buffer is a PCL-CVS buffer:
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
676
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
677
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
678 @table @kbd
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
679 @item @key{SPC}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
680 @itemx n
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
681 These keys move the cursor one file forward, towards the end of the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
682 buffer (@code{cvs-mode-next-line}).@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
683
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
684 @itemx p
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
685 This key moves one file backward, towards the beginning of the buffer
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
686 (@code{cvs-mode-previous-line}).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
687 @end table
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
688
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
689
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
690 @node Marking files, Committing changes, Movement commands, Commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
691 @section Marking files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
692 @cindex Selecting files (commands to mark files)
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
693 @cindex Marking files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
694 @kindex m@r{--marking a file}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
695 @kindex M@r{--marking all files}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
696 @kindex u@r{--unmark a file}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
697 @kindex ESC DEL@r{--unmark all files}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
698 @kindex DEL@r{--unmark previous file}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
699 @kindex %@r{--mark files matching regexp}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
700 @kindex S@r{--mark files in a particular state}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
701 @kindex T@r{--toggle marks}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
702 @findex cvs-mode-mark
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
703 @findex cvs-mode-unmark
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
704 @findex cvs-mode-mark-all-files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
705 @findex cvs-mode-unmark-all-files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
706 @findex cvs-mode-unmark-up
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
707 @findex cvs-mode-mark-matching-files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
708 @findex cvs-mode-mark-on-state
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
709 @findex cvs-mode-toggle-marks
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
710
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
711 PCL-CVS works on a set of @dfn{selected files} (@pxref{Selected files}).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
712 You can mark and unmark files with these commands:
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
713
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
714 @table @kbd
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
715 @item m
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
716 This marks the file that the cursor is positioned on. If the cursor is
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
717 positioned on a directory all files in that directory are marked
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
718 (@code{cvs-mode-mark}).@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
719
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
720 @item u
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
721 Unmark the file that the cursor is positioned on. If the cursor is on a
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
722 directory, all files in that directory are unmarked
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
723 (@code{cvs-mode-unmark}).@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
724
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
725 @item M
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
726 Mark @emph{all} files in the buffer (@code{cvs-mode-mark-all-files}).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
727
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
728 @item M-@key{DEL}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
729 Unmark @emph{all} files (@code{cvs-mode-unmark-all-files}).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
730
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
731 @item @key{DEL}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
732 Unmark the file on the previous line, and move point to that line
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
733 (@code{cvs-mode-unmark-up}).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
734
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
735 @item %
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
736 Mark all files matching a regular expression
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
737 (@code{cvs-mode-mark-matching-files}).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
738
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
739 @item S
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
740 Mark all files in a particular state, such as ``Modified'' or
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
741 ``Removed'' (@code{cvs-mode-mark-on-state}).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
742
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
743 @item T
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
744 Toggle use of marks for the next command (@code{cvs-mode-toggle-marks}).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
745 @end table
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
746
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
747
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
748 @node Committing changes, Editing files, Marking files, Commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
749 @section Committing changes
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
750 @cindex Committing changes
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
751 @findex cvs-mode-commit
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
752 @findex cvs-mode-commit-setup
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
753 @kindex c@r{--commit files}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
754 @kindex C@r{--commit files with @file{ChangeLog} message}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
755 @vindex cvs-auto-revert@r{ (variable)}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
756 @cindex Commit buffer
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
757 @cindex Edit buffer
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
758 @cindex Erasing commit message
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
759 @cindex Reverting buffers after commit
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
760
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
761 Committing changes basically works as follows:
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
762
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
763 @enumerate
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
764 @item
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
765 After having selected the files you want to commit, you type either
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
766 @kbd{c} or @kbd{C} which brings up a special buffer
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
767 @samp{*cvs-commit*}.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
768
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
769 @item
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
770 You type in the log message describing the changes you're about to
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
771 commit (@pxref{Log Edit Mode}).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
772
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
773 @item
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
774 When you're happy with it, you type @kbd{C-c C-c} to do the actual
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
775 commit.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
776 @end enumerate
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
777
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
778 There's no hidden state, so you can abort the process or pick it up
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
779 again at any time.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
780
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
781 @vindex log-edit-confirm@r{ (variable)}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
782 The set of files actually committed is really decided only during the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
783 very last step, which is a mixed blessing. It allows you to go back and
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
784 change your mind about which files to commit, but it also means that you
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
785 might inadvertently change the set of selected files. To reduce the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
786 risk of error, @kbd{C-c C-c} will ask for confirmation if the set of
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
787 selected files has changed between the first step and the last. You can
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
788 change this last detail with @code{log-edit-confirm}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
789
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
790 As for the difference between @kbd{c} (i.e. @code{cvs-mode-commit}) and
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
791 @kbd{C} (i.e. @code{cvs-mode-commit-setup}) is that the first gets you
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
792 straight to @samp{*cvs-commit*} without erasing it or changing anything
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
793 to its content, while the second first erases @samp{*cvs-commit*}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
794 and tries to initialize it with a sane default (it does that by either
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
795 using a template provided by the CVS administrator or by extracting a
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
796 relevant log message from a @file{ChangeLog} file).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
797
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
798 If you are editing the files in your Emacs, an automatic
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
799 @samp{revert-buffer} will be performed. (If the file contains
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
800 @samp{$@asis{Id}$} keywords, @samp{cvs commit} will write a new file with
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
801 the new values substituted. The auto-revert makes sure that you get
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
802 them into your buffer.) The revert will not occur if you have modified
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
803 your buffer, or if @samp{cvs-auto-revert} is set to
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
804 @samp{nil}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
805
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
806
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
807 @node Editing files, Getting info about files, Committing changes, Commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
808 @section Editing files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
809 @cindex Editing files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
810 @cindex Finding files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
811 @cindex Loading files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
812 @cindex Dired
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
813 @cindex Invoking dired
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
814 @findex cvs-mode-find-file
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
815 @findex cvs-mode-find-file-other-window
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
816 @findex cvs-mode-add-change-log-entry-other-window
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
817 @kindex f@r{--find file or directory}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
818 @kindex o@r{--find file in other window}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
819 @kindex A@r{--add @file{ChangeLog} entry}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
820
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
821 There are currently three commands that can be used to find a file (that
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
822 is, load it into a buffer and start editing it there). These commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
823 work on the line that the cursor is situated at. They always ignore any marked
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
824 files.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
825
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
826 @table @kbd
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
827 @item f
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
828 Find the file that the cursor points to (@code{cvs-mode-find-file}). If
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
829 the cursor points to a directory, run @code{dired} on that directory;
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
830 @inforef{Dired, , emacs}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
831
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
832 @item o
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
833 Like @kbd{f}, but use another window
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
834 (@code{cvs-mode-find-file-other-window}).@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
835
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
836 @item A
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
837 Invoke @samp{add-change-log-entry-other-window} to edit a
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
838 @file{ChangeLog} file. The @file{ChangeLog} file will be found in the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
839 directory of the file the cursor points to, or in a parent of that
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
840 directory (@code{cvs-mode-add-change-log-entry-other-window}).@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
841 @end table
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
842
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
843
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
844 @node Getting info about files, Adding and removing files, Editing files, Commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
845 @section Getting info about files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
846 @cindex Status (cvs command)
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
847 @cindex Log (RCS/cvs command)
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
848 @cindex Getting status
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
849 @kindex l@r{--run @samp{cvs log}}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
850 @kindex s@r{--run @samp{cvs status}}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
851 @findex cvs-mode-log
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
852 @findex cvs-mode-status
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
853
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
854 @table @kbd
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
855 @item l
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
856 Call the command @code{cvs-mode-log} which runs @samp{cvs log} on all
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
857 selected files, and show the result in a temporary buffer
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
858 @samp{*cvs-info*} (@pxref{Log View Mode}).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
859
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
860 @item s
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
861 Call the command @code{cvs-mode-status} which runs @samp{cvs status} on
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
862 all selected files, and show the result in a temporary buffer
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
863 @samp{*cvs-info*}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
864 @c Fixme: reinstate when node is written:
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
865 @c (@pxref{CVS Status Mode}).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
866 @end table
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
867
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
868
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
869 @node Adding and removing files, Undoing changes, Getting info about files, Commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
870 @section Adding and removing files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
871 @cindex Adding files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
872 @cindex Removing files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
873 @cindex Resurrecting files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
874 @cindex Deleting files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
875 @cindex Putting files under CVS control
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
876 @kindex a@r{--add a file}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
877 @kindex r@r{--remove a file}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
878 @findex cvs-mode-add
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
879 @findex cvs-mode-remove-file
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
880
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
881 The following commands are available to make it easy to add files to
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
882 and remove them from the CVS repository.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
883
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
884 @table @kbd
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
885 @item a
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
886 Add all selected files. This command can be used on @samp{Unknown}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
887 files (@pxref{Buffer contents}). The status of the file will change to
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
888 @samp{Added}, and you will have to use @kbd{c} (@samp{cvs-mode-commit}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
889 @pxref{Committing changes}), to really add the file to the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
890 repository.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
891
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
892 This command can also be used on @samp{Removed} files (before you commit
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
893 them) to resurrect them.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
894
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
895 The command that is run is @code{cvs-mode-add}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
896
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
897 @item r
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
898 This command removes the selected files (after prompting for
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
899 confirmation). The files are deleted from your directory and
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
900 (unless the status was @samp{Unknown}; @pxref{Buffer contents}) they will
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
901 also be @samp{cvs remove}d. If the files' status was @samp{Unknown}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
902 they will disappear from the buffer. Otherwise their status will change to
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
903 @samp{Removed}, and you must use @kbd{c} (@samp{cvs-mode-commit},
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
904 @pxref{Committing changes}) to commit the removal.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
905
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
906 The command that is run is @code{cvs-mode-remove-file}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
907 @end table
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
908
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
909
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
910 @node Undoing changes, Removing handled entries, Adding and removing files, Commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
911 @section Undoing changes
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
912 @cindex Undo changes
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
913 @cindex Flush changes
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
914 @kindex U@r{--undo changes}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
915 @findex cvs-mode-undo-local-changes
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
916
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
917 @table @kbd
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
918 @item U
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
919 If you have modified a file, and for some reason decide that you don't
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
920 want to keep the changes, you can undo them with this command. It works
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
921 by removing your working copy of the file and then getting the latest
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
922 version from the repository (@code{cvs-mode-undo-local-changes}).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
923 @end table
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
924
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
925
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
926 @node Removing handled entries, Ignoring files, Undoing changes, Commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
927 @section Removing handled entries
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
928 @cindex Expunging uninteresting entries
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
929 @cindex Uninteresting entries, getting rid of them
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
930 @cindex Getting rid of uninteresting lines
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
931 @cindex Removing uninteresting (processed) lines
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
932 @cindex Handled lines, removing them
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
933 @kindex x@r{--remove processed entries}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
934 @kindex C-k@r{--remove selected entries}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
935 @findex cvs-mode-remove-handled
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
936 @findex cvs-mode-acknowledge
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
937 @findex cvs-mode-ignore
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
938
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
939 @table @kbd
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
940 @item x
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
941 This command allows you to remove all entries that you have processed.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
942 More specifically, the lines for @samp{Up-to-date} files (@pxref{Buffer
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
943 contents}) are removed from the buffer. If a directory becomes empty
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
944 the heading for that directory is also removed. This makes it easier to
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
945 get an overview of what needs to be done.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
946
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
947 @vindex cvs-mode-remove-handled@r{ (variable)}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
948 @kbd{x} invokes @code{cvs-mode-remove-handled}. If
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
949 @samp{cvs-auto-remove-handled} is set to non-@code{nil}, this will
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
950 automatically be performed after every commit.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
951
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
952 @item C-k
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
953 This command can be used for lines that @samp{cvs-mode-remove-handled} would
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
954 not delete, but that you want to delete (@code{cvs-mode-acknowledge}).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
955 @end table
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
956
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
957
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
958 @node Ignoring files, Viewing differences, Removing handled entries, Commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
959 @section Ignoring files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
960 @cindex Ignoring files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
961 @kindex i@r{--ignoring files}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
962 @findex cvs-mode-ignore
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
963
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
964 @table @kbd
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
965 @item i
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
966 Arrange so that CVS will ignore the selected files. The file names are
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
967 added to the @file{.cvsignore} file in the corresponding directory. If
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
968 the @file{.cvsignore} file doesn't exist, it will be created.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
969
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
970 The @file{.cvsignore} file should normally be added to the repository,
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
971 but you could ignore it as well, if you like it better that way.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
972
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
973 This runs @code{cvs-mode-ignore}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
974 @end table
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
975
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
976 @node Viewing differences, Invoking Ediff, Ignoring files, Commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
977 @section Viewing differences
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
978 @cindex Diff
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
979 @cindex Invoking @code{diff}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
980 @cindex Conflicts, how to resolve them
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
981 @cindex Viewing differences
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
982 @kindex d=@r{--run @samp{cvs diff}}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
983 @kindex =@r{--run @samp{cvs diff}}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
984 @kindex db@r{--diff against base version}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
985 @kindex dh@r{--diff against head of repository}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
986 @kindex dr@r{--diff between base and head of repository}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
987 @kindex dv@r{--diff against vendor branch}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
988 @kindex dy@r{--diff against yesterday's head}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
989 @findex cvs-mode-diff
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
990 @findex cvs-mode-diff-backup
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
991 @findex cvs-mode-diff-head
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
992 @findex cvs-mode-diff-repository
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
993 @findex cvs-mode-diff-vendor
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
994 @findex cvs-mode-diff-yesterday
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
995 @vindex cvs-invert-ignore-marks@r{ (variable)}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
996
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
997 @table @kbd
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
998 @item =
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
999 @itemx d =
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1000 Display a @samp{cvs diff} between the selected files and the version
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1001 that they are based on (@code{cvs-mode-diff}).@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1002
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1003 @item d b
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1004 If CVS finds a conflict while merging two versions of a file (during a
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1005 @samp{cvs update}, @pxref{Updating the buffer}) it will save the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1006 original file in a file called @file{.#@var{file}.@var{version}} where
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1007 @var{file} is the name of the file, and @var{version} is the revision
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1008 number that @var{file} was based on.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1009
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1010 With the @kbd{d b} command you can run a @samp{diff} on the files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1011 @file{.#@var{file}.@var{version}} and @file{@var{file}}.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1012
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1013 @item d h
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1014 Display a @samp{cvs diff} between the selected files and the head
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1015 revision (the most recent version on the current
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1016 branch) in the repository (@code{cvs-mode-diff-head}).@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1017
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1018 @item d r
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1019 Display a @samp{cvs diff} between the base revision of the selected
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1020 files and the head revision in the repository. This displays the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1021 changes anyone has committed to the repository since you last executed
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1022 a checkout, update or commit operation
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1023 (@code{cvs-mode-diff-repository}).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1024
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1025 @item d v
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1026 Display a @samp{cvs diff} between the selected files and the head
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1027 revision of the vendor branch in the repository
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1028 (@code{cvs-mode-diff-vendor}).@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1029
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1030 @item d y
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1031 Display a @samp{cvs diff} between the selected files and yesterday's
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1032 head revision in the repository
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1033 (@code{cvs-mode-diff-yesterday}).@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1034 @end table
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1035
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1036 By default, @samp{diff} commands ignore the marks. This can be changed
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1037 with @code{cvs-invert-ignore-marks}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1038
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1039 @node Invoking Ediff, Updating files, Viewing differences, Commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1040 @section Running ediff
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1041 @cindex Ediff
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1042 @cindex Invoking ediff
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1043 @cindex Viewing differences
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1044 @cindex Conflicts, how to resolve them
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1045 @cindex Resolving conflicts
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1046 @kindex e@r{--invoke @samp{ediff}}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1047 @findex cvs-mode-idiff
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1048 @findex cvs-mode-imerge
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1049
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1050 @table @kbd
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1051 @vindex cvs-idiff-imerge-handlers@r{ (variable)}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1052 @item d e
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1053 This uses @code{ediff} (or @code{emerge}, depending on
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1054 @samp{cvs-idiff-imerge-handlers}) to allow you to view diffs.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1055 If a prefix argument is given, PCL-CVS will prompt for a revision against
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1056 which the diff should be made, else the default will be to use the BASE
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1057 revision.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1058
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1059 @cindex Merging with @code{ediff} and @code{emerge}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1060 @item d E
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1061 This command use @code{ediff} (or @code{emerge}, see above) to allow you
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1062 to do an interactive 3-way merge.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1063
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1064 @strong{Please note:} when the file status is @samp{Conflict},
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1065 CVS has already performed a merge. The resulting file is not used in
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1066 any way if you use this command. If you use the @kbd{q} command inside
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1067 @samp{ediff} (to successfully terminate a merge) the file that CVS
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1068 created will be overwritten.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1069 @end table
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1070
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1071 @node Updating files, Tagging files, Invoking Ediff, Commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1072 @section Updating files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1073 @findex cvs-mode-update
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1074 @cindex Updating files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1075 @kindex O@r{--update files}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1076
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1077 @table @kbd
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1078 @item O
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1079 Update all selected files with status @samp{Need-update} by running
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1080 @samp{cvs update} on them (@code{cvs-mode-update}).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1081 @end table
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1082
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1083
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1084 @node Tagging files, Miscellaneous commands, Updating files, Commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1085 @section Tagging files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1086 @findex cvs-mode-tag
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1087 @findex cvs-mode-untag
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1088 @findex cvs-rtag
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1089 @cindex Tagging files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1090 @kindex M-t@r{--repository tag files}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1091 @kindex t@r{--tag files}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1092 @vindex cvs-invert-ignore-marks@r{ (variable)}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1093 @vindex cvs-force-dir-tag@r{ (variable)}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1094
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1095 @table @kbd
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1096 @item t
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1097 Tag all selected files by running @samp{cvs tag} on
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1098 them (@code{cvs-mode-tag}). It's usually preferable to tag a directory
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1099 at a time. Rather than selecting all files (which too often doesn't
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1100 select all files but only the few that are displayed), clear the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1101 selection with @kbd{M-DEL} (@code{cvs-mode-unmark-all-files}), position
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1102 the cursor on the directory you want to tag and hit @kbd{t}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1103 @end table
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1104
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1105 By default, @samp{tag} commands ignore the marks. This can be changed
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1106 with @code{cvs-invert-ignore-marks}. Also, by default @samp{tag} can
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1107 only be applied to directories, see @code{cvs-force-dir-tag} if you want
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1108 to change this behavior.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1109
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1110
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1111 @node Miscellaneous commands, , Tagging files, Commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1112 @section Miscellaneous commands
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1113 @findex cvs-mode-byte-compile-files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1114 @cindex Recompiling elisp files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1115 @cindex Byte compilation
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1116 @findex cvs-mode-delete-lock
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1117 @cindex Getting rid of lock files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1118 @cindex Lock files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1119 @kindex q@r{--bury the PCL-CVS buffer}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1120 @findex cvs-bury-buffer
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1121 @findex cvs-mode-quit
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1122 @cindex Quitting
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1123 @kindex h@r{--help}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1124 @kindex ?@r{--help}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1125 @findex cvs-help
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1126 @cindex Help
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1127
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1128 @table @kbd
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1129 @item M-x cvs-mode-byte-compile-files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1130 Byte compile all selected files that end in @file{.el}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1131
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1132 @item M-x cvs-mode-delete-lock
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1133 This command deletes the lock files that
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1134 the @samp{*cvs*} buffer informs you about. You should normally never have to
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1135 use this command, since CVS tries very carefully to always remove the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1136 lock files itself.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1137
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1138 You can only use this command when a message in the @samp{*cvs*} buffer tells
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1139 you so. You should wait a while before using this command in case
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1140 someone else is running a @code{cvs} command.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1141
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1142 Also note that this only works if the repository is local.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1143
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1144 @item ?
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1145 @itemx h
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1146 Show a summary of common command key bindings in the echo
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1147 area (@code{cvs-help}).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1148
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1149 @item q
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1150 Bury the PCL-CVS buffer (@code{cvs-bury-buffer}).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1151
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1152 @item M-x cvs-mode-quit
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1153 Quit PCL-CVS, killing the @samp{*cvs*} buffer.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1154 @end table
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1155
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1156 @node Log Edit Mode, Log View Mode, Commands, Top
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1157 @chapter Editing a Log Message
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1158
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1159 @cindex Log Edit mode
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1160 @cindex mode, Log Edit
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1161 Buffers for entering/editing log messages for changes which are about
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1162 to be committed are put into Log Edit mode.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1163
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1164 Sometimes the log buffer contains default text when you enter it,
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1165 typically the last log message entered. If it does, mark and point
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1166 are set around the entire contents of the buffer so that it is easy to
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1167 kill the contents of the buffer with @kbd{C-w}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1168
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1169 @findex log-edit-insert-changelog
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1170 If you work by writing entries in the @file{ChangeLog}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1171 (@pxref{(emacs)Change Log}) and then commit the change under revision
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1172 control, you can generate the Log Edit text from the ChangeLog using
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1173 @kbd{C-c C-a} (@kbd{log-edit-insert-changelog}). This looks for
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1174 entries for the file(s) concerned in the top entry in the ChangeLog
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1175 and uses those paragraphs as the log text. This text is only inserted
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1176 if the top entry was made under your user name on the current date.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1177 @xref{(emacs)Change Logs and VC}, for the opposite way of
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1178 working---generating ChangeLog entries from the revision control log.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1179
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1180 In the Log Edit buffer, @kbd{C-c C-f} (@kbd{M-x log-edit-show-files})
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1181 shows the list of files to be committed in case you need to check
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1182 that.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1183
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1184 When you have finished editing the log message, type @kbd{C-c C-c} to
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1185 exit the buffer and commit the change.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1186
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1187 @c Fixme: customization variables
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1188
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1189 @node Log View Mode, Customization, Log Edit Mode, Top
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1190 @chapter Browsing a Log of Changes
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1191
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1192 @cindex Log View mode
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1193 @cindex mode, Log View
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1194 @cindex output, logs
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1195
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1196 @findex cvs-mode-log
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1197 @findex vc-print-log
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1198 Log View mode provides a few useful commands for navigating revision
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1199 control log output. It is used for the output buffers of both
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1200 @code{cvs-mode-log} and @code{vc-print-log}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1201
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1202 In this mode, @kbd{n} goes to the next message and @kbd{p} goes to the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1203 previous message and @kbd{N} and @kbd{P} go to the next and previous
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1204 files, respectively, in multi-file output. With a numeric prefix
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1205 argument, these commands move that many messages of files.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1206
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1207 @c @node CVS Status Mode
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1208 @c @chapter Viewing CVS' Status output
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1209
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1210 @node Customization, Bugs, Log View Mode, Top
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1211 @chapter Customization
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1212 @vindex log-edit-changelog-full-paragraphs@r{ (variable)}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1213 @vindex cvs-auto-remove-handled@r{ (variable)}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1214 @vindex cvs-auto-remove-directories@r{ (variable)}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1215 @vindex cvs-update-prog-output-skip-regexp@r{ (variable)}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1216 @vindex cvs-cvsroot@r{ (variable)}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1217 @vindex cvs-auto-revert@r{ (variable)}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1218 @vindex log-edit-require-final-newline@r{ (variable)}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1219 @vindex cvs-sort-ignore-file@r{ (variable)}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1220 @cindex Customization
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1221 @cindex Variables, list of all
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1222 @cindex Erasing input buffer
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1223 @cindex Context diff, how to get
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1224 @cindex Unidiff, how to get
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1225 @cindex Automatically remove handled files
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1226 @cindex @samp{-u} option in modules file
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1227 @cindex Modules file (@samp{-u} option)
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1228 @cindex Update program (@samp{-u} option in modules file)
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1229 @cindex Reverting buffers after commit
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1230 @cindex Require final newline
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1231 @cindex Automatically inserting newline
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1232 @cindex Commit message, inserting newline
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1233 @cindex Sorting @file{.cvsignore} file
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1234 @cindex @file{.cvsignore} file, sorting
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1235 @cindex Automatically sorting @file{.cvsignore}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1236 @cindex @samp{CVSROOT}, overriding
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1237
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1238 If you have an idea about any customization that would be handy but
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1239 isn't present in this list, please tell us!
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1240 For info on how to reach us, see @ref{Bugs}.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1241
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1242 @table @samp
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1243 @item cvs-auto-remove-handled
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1244 If this variable is set to any non-@code{nil} value,
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1245 @samp{cvs-mode-remove-handled} will be called every time you check in
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1246 files, after the check-in is ready. @xref{Removing handled
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1247 entries}.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1248
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1249 @item cvs-auto-remove-directories
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1250 If this variable is set to any non-@code{nil} value, directories that do
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1251 not contain any files to be checked in will not be listed in the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1252 @samp{*cvs*} buffer.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1253
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1254 @item cvs-auto-revert
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1255 If this variable is set to any non-@samp{nil} value any buffers you have
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1256 that visit a file that is committed will be automatically reverted.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1257 This variable defaults to @samp{t}. @xref{Committing changes}.@refill
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1258
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1259 @item cvs-update-prog-output-skip-regexp
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1260 The @samp{-u} flag in the @file{modules} file can be used to run a command
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1261 whenever a @samp{cvs update} is performed (see @code{cvs(5)}). This regexp
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1262 is used to search for the last line in that output. It is normally set
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1263 to @samp{$}. That setting is only correct if the command outputs
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1264 nothing. Note that PCL-CVS will get very confused if the command
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1265 outputs @emph{anything} to @code{stderr}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1266
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1267 @item cvs-cvsroot
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1268 This variable can be set to override @samp{CVSROOT}. It should be a
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1269 string. If it is set, then every time a @code{cvs} command is run, it
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1270 will be called as @samp{cvs -d @var{cvs-cvsroot}@dots{}}. This can be
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1271 useful if your site has several repositories.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1272
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1273 @item log-edit-require-final-newline
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1274 @c wordy to avoid unhderfull hbox
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1275 When you enter a log message by typing into the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1276 @samp{*cvs-commit-message*} buffer, PCL-CVS normally automatically
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1277 inserts a trailing newline, unless there already is one. This behavior
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1278 can be controlled via @samp{cvs-commit-buffer-require-final-newline}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1279 If it is @samp{t} (the default behavior), a newline will always be
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1280 appended. If it is @samp{nil}, newlines will never be appended. Any
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1281 other value causes PCL-CVS to ask the user whenever there is no trailing
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1282 newline in the commit message buffer.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1283
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1284 @findex cvs-mode-changelog-commit
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1285 @item log-edit-changelog-full-paragraphs
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1286 If this variable is non-@code{nil}, include full @file{ChangeLog}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1287 paragraphs in the CVS log created by @samp{cvs-mode-changelog-commit}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1288 This may be set in the local variables section of a @file{ChangeLog}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1289 file, to indicate the policy for that @file{ChangeLog}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1290
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1291 @cindex @file{ChangeLog} paragraphs
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1292 A @dfn{@file{ChangeLog} paragraph} is a bunch of log text containing no
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1293 blank lines; a paragraph usually describes a set of changes with a
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1294 single purpose, but perhaps spanning several functions in several files.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1295 Changes in different paragraphs are unrelated.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1296
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1297 You could argue that the CVS log entry for a file should contain the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1298 full @file{ChangeLog} paragraph mentioning the change to the file, even though
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1299 it may mention other files, because that gives you the full context you
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1300 need to understand the change. This is the behavior you get when this
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1301 variable is set to @code{t}, the default.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1302
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1303 On the other hand, you could argue that the CVS log entry for a change
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1304 should contain only the text for the changes which occurred in that
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1305 file, because the CVS log is per-file. This is the behavior you get
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1306 when this variable is set to @code{nil}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1307
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1308 @findex cvs-mode-ignore@r{, and @file{.cvsignore} sorting}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1309 @item cvs-sort-ignore-file
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1310 If this variable is set to any non-@samp{nil} value, the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1311 @file{.cvsignore} file will always be sorted whenever you use
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1312 @samp{cvs-mode-ignore} to add a file to it. This option is on by
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1313 default.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1314 @end table
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1315
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1316
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1317 @menu
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1318 * Customizing Faces::
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1319 @end menu
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1320
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1321 @node Customizing Faces, , Customization, Customization
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1322 @section Customizing Faces
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1323 @vindex cvs-header (face)
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1324 @vindex cvs-filename (face)
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1325 @vindex cvs-unknown (face)
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1326 @vindex cvs-handled (face)
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1327 @vindex cvs-need-action (face)
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1328 @vindex cvs-marked (face)
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1329 @vindex cvs-msg (face)
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1330
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1331 PCL-CVS adds a few extra features, including menus, mouse bindings, and
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1332 fontification of the @samp{*cvs*} buffer. The faces defined for
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1333 fontification are listed below:
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1334
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1335 @table @samp
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1336 @item cvs-header
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1337 used to highlight directory changes.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1338
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1339 @item cvs-filename
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1340 Used to highlight file names.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1341
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1342 @item cvs-unknown
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1343 Used to highlight the status of files which are @samp{Unknown}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1344
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1345 @item cvs-handled
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1346 Used to highlight the status of files which are handled and
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1347 need no further action.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1348
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1349 @item cvs-need-action
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1350 Used to highlight the status of files which still need action.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1351
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1352 @item cvs-marked
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1353 Used to highlight the marked file indicator (@samp{*}).
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1354
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1355 @item cvs-msg
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1356 Used to highlight CVS messages.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1357 @end table
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1358
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1359
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1360 @node Bugs, GNU Free Documentation License, Customization, Top
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1361 @chapter Bugs (known and unknown)
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1362 @cindex Reporting bugs and ideas
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1363 @cindex Bugs, how to report them
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1364 @cindex Author, how to reach
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1365 @cindex Email to the author
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1366 @cindex Known bugs
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1367 @cindex Bugs, known
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1368 @cindex FAQ
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1369 @cindex Problems, list of common
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1370
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1371 If you find a bug or misfeature, don't hesitate to tell us! Send email
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1372 to @email{bug-gnu-emacs@@gnu.org} which is gatewayed to the newsgroup
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1373 @samp{gnu.emacs.bugs}. Feature requests should also be sent there. We
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1374 prefer discussing one thing at a time. If you find several unrelated
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1375 bugs, please report them separately. If you are running PCL-CVS under
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1376 XEmacs, you should also send a copy of bug reports to
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1377 @email{xemacs-beta@@xemacs.org}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1378
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1379 If you have problems using PCL-CVS or other questions, send them to
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1380 @email{help-gnu-emacs@@gnu.org}, which is gatewayed to the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1381 @samp{gnu.emacs.help} newsgroup. This is a good place to get help, as
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1382 is @email{cvs-info@@gnu.org}, gatewayed to @samp{gnu.cvs.help}.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1383
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1384 If you have ideas for improvements, or if you have written some
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1385 extensions to this package, we would like to hear from you. We hope that
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1386 you find this package useful!
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1387
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1388 Below is a partial list of currently known problems with PCL-CVS.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1389
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1390 @table @asis
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1391 @item Unexpected output from CVS
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1392 Unexpected output from CVS may confuse PCL-CVS. It will create
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1393 warning messages in the @samp{*cvs*} buffer alerting you to any parse errors.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1394 If you get these messages, please send a bug report to the email
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1395 addresses listed above. Include the contents of the @samp{*cvs*} buffer, the
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1396 output of the CVS process (which should be found in the @samp{ *cvs-tmp*}
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1397 buffer), and the versions of Emacs, PCL-CVS and CVS you are using.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1398 @end table
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1399
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1400 @node GNU Free Documentation License, Function and Variable Index, Bugs, Top
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1401 @appendix GNU Free Documentation License
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1402 @include doclicense.texi
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1403
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1404
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1405
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1406 @node Function and Variable Index, Concept Index, GNU Free Documentation License, Top
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1407 @unnumbered Function and Variable Index
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1408
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1409 This is an index of all the functions and variables documented in this
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1410 manual.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1411
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1412 @printindex fn
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1413
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1414 @node Concept Index, Key Index, Function and Variable Index, Top
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1415 @unnumbered Concept Index
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1416
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1417 This is an index of concepts discussed in this manual.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1418
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1419 @printindex cp
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1420
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1421 @node Key Index, , Concept Index, Top
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1422 @unnumbered Key Index
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1423
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1424 This index includes an entry for each PCL-CVS key sequence documented in
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1425 this manual.
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1426
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1427 @printindex ky
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1428
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1429 @setchapternewpage odd
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1430 @summarycontents
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1431 @contents
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1432 @bye
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1433
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1434 @ignore
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1435 arch-tag: 5c7178ce-56fa-40b0-abd7-f4a09758b235
537ecf6520b8 Move here from ../../man
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1436 @end ignore