annotate man/pcl-cvs.texi @ 82436:396a03499dc0

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