Mercurial > emacs
comparison man/pcl-cvs.texi @ 88155:d7ddb3e565de
sync with trunk
author | Henrik Enberg <henrik.enberg@telia.com> |
---|---|
date | Mon, 16 Jan 2006 00:03:54 +0000 |
parents | 23a1cea22d13 |
children |
comparison
equal
deleted
inserted
replaced
88154:8ce476d3ba36 | 88155:d7ddb3e565de |
---|---|
1 \input texinfo @c -*-texinfo-*- | 1 \input texinfo @c -*-texinfo-*- |
2 @c "@(#)$Name: $:$Id: pcl-cvs.texi,v 1.18 2002/12/07 13:38:26 pj Exp $" | |
3 @c %**start of header | 2 @c %**start of header |
4 @setfilename ../info/pcl-cvs | 3 @setfilename ../info/pcl-cvs |
5 @settitle PCL-CVS --- Emacs Front-End to CVS | 4 @settitle PCL-CVS --- Emacs Front-End to CVS |
6 @syncodeindex vr fn | 5 @syncodeindex vr fn |
7 @c %**end of header | 6 @c %**end of header |
8 | 7 |
9 @copying | 8 @copying |
10 Copyright @copyright{} 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, | 9 Copyright @copyright{} 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, |
11 1999, 2000, 2002 Free Software Foundation, Inc. | 10 1999, 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. |
12 | 11 |
13 @quotation | 12 @quotation |
14 Permission is granted to copy, distribute and/or modify this document | 13 Permission is granted to copy, distribute and/or modify this document |
15 under the terms of the GNU Free Documentation License, Version 1.1 or | 14 under the terms of the GNU Free Documentation License, Version 1.2 or |
16 any later version published by the Free Software Foundation; with the | 15 any later version published by the Free Software Foundation; with the |
17 Invariant Sections being ``The GNU Manifesto'', ``Distribution'' and | 16 Invariant Sections being ``The GNU Manifesto'', ``Distribution'' and |
18 ``GNU GENERAL PUBLIC LICENSE'', with the Front-Cover texts being ``A GNU | 17 ``GNU GENERAL PUBLIC LICENSE'', with the Front-Cover texts being ``A GNU |
19 Manual'', and with the Back-Cover Texts as in (a) below. A copy of the | 18 Manual'', and with the Back-Cover Texts as in (a) below. A copy of the |
20 license is included in the section entitled ``GNU Free Documentation | 19 license is included in the section entitled ``GNU Free Documentation |
76 of the various commands and major modes for further information. | 75 of the various commands and major modes for further information. |
77 @c This manual is updated to release 2.5 of PCL-CVS. | 76 @c This manual is updated to release 2.5 of PCL-CVS. |
78 @end ifnottex | 77 @end ifnottex |
79 | 78 |
80 @menu | 79 @menu |
81 * About PCL-CVS:: Installation, credits, history, @dots{} | 80 * About PCL-CVS:: Credits, history, @dots{} |
82 | 81 |
83 * Getting started:: An introduction with a walk-through example. | 82 * Getting started:: An introduction with a walk-through example. |
84 * Buffer contents:: An explanation of the buffer contents. | 83 * Buffer contents:: An explanation of the buffer contents. |
85 * Selected files:: To which files are commands applied. | 84 * Selected files:: To which files are commands applied. |
86 * Commands:: All commands, grouped by type. | 85 * Commands:: All commands, grouped by type. |
99 --- The Detailed Node Listing --- | 98 --- The Detailed Node Listing --- |
100 | 99 |
101 About PCL-CVS | 100 About PCL-CVS |
102 | 101 |
103 * Contributors:: Contributors to PCL-CVS. | 102 * Contributors:: Contributors to PCL-CVS. |
104 * Installation:: | |
105 | 103 |
106 Commands | 104 Commands |
107 | 105 |
108 * Entering PCL-CVS:: Commands to invoke PCL-CVS | 106 * Entering PCL-CVS:: Commands to invoke PCL-CVS |
109 * Setting flags:: Setting flags for CVS commands | 107 * Setting flags:: Setting flags for CVS commands |
151 version 2.0 never seemed to be able to leave the ``beta'' stage while a | 149 version 2.0 never seemed to be able to leave the ``beta'' stage while a |
152 separate XEmacs version was slowly splitting away. In late 1998, | 150 separate XEmacs version was slowly splitting away. In late 1998, |
153 Stefan Monnier picked up development again, adding some major new | 151 Stefan Monnier picked up development again, adding some major new |
154 functionality and taking over the maintenance. | 152 functionality and taking over the maintenance. |
155 | 153 |
156 As of Emacs 21, PCL-CVS is part of the standard Emacs distribution. | |
157 | |
158 @menu | 154 @menu |
159 * Contributors:: Contributors to PCL-CVS. | 155 * Contributors:: Contributors to PCL-CVS. |
160 * Installation:: | |
161 @end menu | 156 @end menu |
162 | 157 |
163 @node Contributors, Installation, About PCL-CVS, About PCL-CVS | 158 @node Contributors,, About PCL-CVS, About PCL-CVS |
164 @section Contributors to PCL-CVS | 159 @section Contributors to PCL-CVS |
165 @cindex Contributors | 160 @cindex Contributors |
166 @cindex Authors | 161 @cindex Authors |
167 | 162 |
168 Contributions to the package are welcome. I have limited time to work | 163 Contributions to the package are welcome. I have limited time to work |
233 @end itemize | 228 @end itemize |
234 | 229 |
235 Apart from these, a lot of people have sent us suggestions, ideas, | 230 Apart from these, a lot of people have sent us suggestions, ideas, |
236 requests, bug reports and encouragement. Thanks a lot! Without you | 231 requests, bug reports and encouragement. Thanks a lot! Without you |
237 there would be no new releases of PCL-CVS. | 232 there would be no new releases of PCL-CVS. |
238 | |
239 | |
240 @node Installation, , Contributors, About PCL-CVS | |
241 @section Installation | |
242 @cindex Installation | |
243 | |
244 As mentioned above, PCL-CVS comes bundled with Emacs version 21.1 and | |
245 later. If you're using Emacs 20, you can download an older version of | |
246 PCL-CVS from @uref{ftp://flint.cs.yale.edu/pub/monnier/pcl-cvs}. That | |
247 version also works on XEmacs. | |
248 | |
249 If you are running XEmacs 21.0 or later, PCL-CVS is available in | |
250 pre-compiled package form. Please refer to the XEmacs manual for | |
251 instructions regarding package selection and installation. Currently, | |
252 that PCL-CVS package also requires you to have installed the | |
253 @file{xemacs-base}, @file{elib}, and @file{dired} packages. | |
254 | |
255 If you have @TeX{} installed at your site, you can make a typeset manual | |
256 from @file{pcl-cvs.texi}. | |
257 | |
258 @enumerate | |
259 @item | |
260 If PCL-CVS came with the Emacs distribution, type @kbd{make pcl-cvs.dvi} | |
261 in the @file{man} subdirectory of the Emacs source tree. | |
262 @item | |
263 Alternatively, run @TeX{} by typing @kbd{texi2dvi pcl-cvs.texi}. | |
264 @item | |
265 Convert the resulting device independent file @file{pcl-cvs.dvi} to a | |
266 form which your printer can output and print it. If you have a | |
267 PostScript printer, there is a program, @code{dvi2ps}, which does. There | |
268 is also a program which comes together with @TeX{}, @code{dvips}, which | |
269 you can use. | |
270 @end enumerate | |
271 | 233 |
272 | 234 |
273 @node Getting started, Buffer contents, About PCL-CVS, Top | 235 @node Getting started, Buffer contents, About PCL-CVS, Top |
274 @chapter Getting started | 236 @chapter Getting started |
275 @cindex Introduction | 237 @cindex Introduction |
475 @cindex Active files | 437 @cindex Active files |
476 @cindex Applicable | 438 @cindex Applicable |
477 | 439 |
478 Many of the commands work on the current set of @dfn{selected} files | 440 Many of the commands work on the current set of @dfn{selected} files |
479 which can be either the set of marked files (if any file is marked and | 441 which can be either the set of marked files (if any file is marked and |
480 marks are no ignored) or whichever file or directory the cursor is on. | 442 marks are not ignored) or whichever file or directory the cursor is on. |
481 | 443 |
482 If a directory is selected but the command cannot be applied to a | 444 If a directory is selected but the command cannot be applied to a |
483 directory, then it will be applied to the set of files under this | 445 directory, then it will be applied to the set of files under this |
484 directory which are in the @samp{*cvs*} buffer. | 446 directory which are in the @samp{*cvs*} buffer. |
485 | 447 |
1024 @cindex Viewing differences | 986 @cindex Viewing differences |
1025 @kindex d=@r{--run @samp{cvs diff}} | 987 @kindex d=@r{--run @samp{cvs diff}} |
1026 @kindex =@r{--run @samp{cvs diff}} | 988 @kindex =@r{--run @samp{cvs diff}} |
1027 @kindex db@r{--diff against base version} | 989 @kindex db@r{--diff against base version} |
1028 @kindex dh@r{--diff against head of repository} | 990 @kindex dh@r{--diff against head of repository} |
991 @kindex dr@r{--diff between base and head of repository} | |
1029 @kindex dv@r{--diff against vendor branch} | 992 @kindex dv@r{--diff against vendor branch} |
993 @kindex dy@r{--diff against yesterday's head} | |
1030 @findex cvs-mode-diff | 994 @findex cvs-mode-diff |
1031 @findex cvs-mode-diff-backup | 995 @findex cvs-mode-diff-backup |
1032 @findex cvs-mode-diff-head | 996 @findex cvs-mode-diff-head |
997 @findex cvs-mode-diff-repository | |
1033 @findex cvs-mode-diff-vendor | 998 @findex cvs-mode-diff-vendor |
999 @findex cvs-mode-diff-yesterday | |
1034 @vindex cvs-invert-ignore-marks@r{ (variable)} | 1000 @vindex cvs-invert-ignore-marks@r{ (variable)} |
1035 | 1001 |
1036 @table @kbd | 1002 @table @kbd |
1037 @item = | 1003 @item = |
1038 @itemx d = | 1004 @itemx d = |
1052 @item d h | 1018 @item d h |
1053 Display a @samp{cvs diff} between the selected files and the head | 1019 Display a @samp{cvs diff} between the selected files and the head |
1054 revision in the repository (the most recent version on the current | 1020 revision in the repository (the most recent version on the current |
1055 branch) (@code{cvs-mode-diff-head}).@refill | 1021 branch) (@code{cvs-mode-diff-head}).@refill |
1056 | 1022 |
1023 @item d r | |
1024 Display a @samp{cvs diff} between the base revision of the selected | |
1025 files and the head revision in the repository. This displays the | |
1026 changes anyone has committed to the repository since you last executed | |
1027 "checkout", "update" or "commit". | |
1028 (@code{cvs-mode-diff-repository}).@refill | |
1029 | |
1057 @item d v | 1030 @item d v |
1058 Display a @samp{cvs diff} between the selected files and the head | 1031 Display a @samp{cvs diff} between the selected files and the head |
1059 revision of the vendor branch in the repository. | 1032 revision of the vendor branch in the repository. |
1060 (@code{cvs-mode-diff-vendor}).@refill | 1033 (@code{cvs-mode-diff-vendor}).@refill |
1034 | |
1035 @item d y | |
1036 Display a @samp{cvs diff} between the selected files and yesterday's | |
1037 head revision in the repository. | |
1038 (@code{cvs-mode-diff-yesterday}).@refill | |
1061 @end table | 1039 @end table |
1062 | 1040 |
1063 By default, @samp{diff} commands ignore the marks. This can be changed | 1041 By default, @samp{diff} commands ignore the marks. This can be changed |
1064 with @code{cvs-invert-ignore-marks}. | 1042 with @code{cvs-invert-ignore-marks}. |
1065 | 1043 |
1086 @cindex Merging with @code{ediff} and @code{emerge} | 1064 @cindex Merging with @code{ediff} and @code{emerge} |
1087 @item d E | 1065 @item d E |
1088 This command use @code{ediff} (or @code{emerge}, see above) to allow you | 1066 This command use @code{ediff} (or @code{emerge}, see above) to allow you |
1089 to do an interactive 3-way merge. | 1067 to do an interactive 3-way merge. |
1090 | 1068 |
1091 @strong{Note:} When the file status is @samp{Conflict}, | 1069 @strong{Please note:} when the file status is @samp{Conflict}, |
1092 CVS has already performed a merge. The resulting file is not used in | 1070 CVS has already performed a merge. The resulting file is not used in |
1093 any way if you use this command. If you use the @kbd{q} command inside | 1071 any way if you use this command. If you use the @kbd{q} command inside |
1094 @samp{ediff} (to successfully terminate a merge) the file that CVS | 1072 @samp{ediff} (to successfully terminate a merge) the file that CVS |
1095 created will be overwritten.@refill | 1073 created will be overwritten.@refill |
1096 @end table | 1074 @end table |
1191 | 1169 |
1192 @findex log-edit-insert-changelog | 1170 @findex log-edit-insert-changelog |
1193 If you work by writing entries in the @file{ChangeLog} | 1171 If you work by writing entries in the @file{ChangeLog} |
1194 (@pxref{(emacs)Change Log}) and then commit the change under revision | 1172 (@pxref{(emacs)Change Log}) and then commit the change under revision |
1195 control, you can generate the Log Edit text from the ChangeLog using | 1173 control, you can generate the Log Edit text from the ChangeLog using |
1196 @kbd{C-a C-a} (@kbd{log-edit-insert-changelog}). This looks for | 1174 @kbd{C-c C-a} (@kbd{log-edit-insert-changelog}). This looks for |
1197 entries for the file(s) concerned in the top entry in the ChangeLog | 1175 entries for the file(s) concerned in the top entry in the ChangeLog |
1198 and uses those paragraphs as the log text. This text is only inserted | 1176 and uses those paragraphs as the log text. This text is only inserted |
1199 if the top entry was made under your user name on the current date. | 1177 if the top entry was made under your user name on the current date. |
1200 @xref{(emacs)Change Logs and VC}, for the opposite way of | 1178 @xref{(emacs)Change Logs and VC}, for the opposite way of |
1201 working---generating ChangeLog entries from the revision control log. | 1179 working---generating ChangeLog entries from the revision control log. |
1441 | 1419 |
1442 @setchapternewpage odd | 1420 @setchapternewpage odd |
1443 @summarycontents | 1421 @summarycontents |
1444 @contents | 1422 @contents |
1445 @bye | 1423 @bye |
1424 | |
1425 @ignore | |
1426 arch-tag: 5c7178ce-56fa-40b0-abd7-f4a09758b235 | |
1427 @end ignore |