Mercurial > emacs
comparison man/pcl-cvs.texi @ 89909:68c22ea6027c
Sync to HEAD
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Fri, 16 Apr 2004 12:51:06 +0000 |
parents | 375f2633d815 |
children | 4c90ffeb71c5 |
comparison
equal
deleted
inserted
replaced
89908:ee1402f7b568 | 89909:68c22ea6027c |
---|---|
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, 2004 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.1 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 |
475 @cindex Active files | 474 @cindex Active files |
476 @cindex Applicable | 475 @cindex Applicable |
477 | 476 |
478 Many of the commands work on the current set of @dfn{selected} files | 477 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 | 478 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. | 479 marks are not ignored) or whichever file or directory the cursor is on. |
481 | 480 |
482 If a directory is selected but the command cannot be applied to a | 481 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 | 482 directory, then it will be applied to the set of files under this |
484 directory which are in the @samp{*cvs*} buffer. | 483 directory which are in the @samp{*cvs*} buffer. |
485 | 484 |
1086 @cindex Merging with @code{ediff} and @code{emerge} | 1085 @cindex Merging with @code{ediff} and @code{emerge} |
1087 @item d E | 1086 @item d E |
1088 This command use @code{ediff} (or @code{emerge}, see above) to allow you | 1087 This command use @code{ediff} (or @code{emerge}, see above) to allow you |
1089 to do an interactive 3-way merge. | 1088 to do an interactive 3-way merge. |
1090 | 1089 |
1091 @strong{Note:} When the file status is @samp{Conflict}, | 1090 @strong{Please note:} when the file status is @samp{Conflict}, |
1092 CVS has already performed a merge. The resulting file is not used in | 1091 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 | 1092 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 | 1093 @samp{ediff} (to successfully terminate a merge) the file that CVS |
1095 created will be overwritten.@refill | 1094 created will be overwritten.@refill |
1096 @end table | 1095 @end table |
1191 | 1190 |
1192 @findex log-edit-insert-changelog | 1191 @findex log-edit-insert-changelog |
1193 If you work by writing entries in the @file{ChangeLog} | 1192 If you work by writing entries in the @file{ChangeLog} |
1194 (@pxref{(emacs)Change Log}) and then commit the change under revision | 1193 (@pxref{(emacs)Change Log}) and then commit the change under revision |
1195 control, you can generate the Log Edit text from the ChangeLog using | 1194 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 | 1195 @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 | 1196 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 | 1197 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. | 1198 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 | 1199 @xref{(emacs)Change Logs and VC}, for the opposite way of |
1201 working---generating ChangeLog entries from the revision control log. | 1200 working---generating ChangeLog entries from the revision control log. |
1441 | 1440 |
1442 @setchapternewpage odd | 1441 @setchapternewpage odd |
1443 @summarycontents | 1442 @summarycontents |
1444 @contents | 1443 @contents |
1445 @bye | 1444 @bye |
1445 | |
1446 @ignore | |
1447 arch-tag: 5c7178ce-56fa-40b0-abd7-f4a09758b235 | |
1448 @end ignore |