annotate man/pcl-cvs.texi @ 59347:8ba567c9a2e3

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