annotate man/pcl-cvs.texi @ 34304:dd613770eb0f

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