Mercurial > emacs
comparison man/pcl-cvs.texi @ 83530:46b1096093f5
Merged from emacs@sv.gnu.org.
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-294
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-295
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-296
Update from CVS: admin/FOR-RELEASE: Update refcard section.
* emacs@sv.gnu.org/emacs--devo--0--patch-297
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-298
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-299
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-300
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-301
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-302
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-303
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-304
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-103
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-104
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-570
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Mon, 12 Jun 2006 07:27:12 +0000 |
parents | c1e013e3dc0e 6a3672000767 |
children | b19aaf4ab0ee |
comparison
equal
deleted
inserted
replaced
83529:0d9e16eab053 | 83530:46b1096093f5 |
---|---|
717 You can mark and unmark files with these commands: | 717 You can mark and unmark files with these commands: |
718 | 718 |
719 @table @kbd | 719 @table @kbd |
720 @item m | 720 @item m |
721 This marks the file that the cursor is positioned on. If the cursor is | 721 This marks the file that the cursor is positioned on. If the cursor is |
722 positioned on a directory all files in that directory are marked. | 722 positioned on a directory all files in that directory are marked |
723 (@code{cvs-mode-mark}).@refill | 723 (@code{cvs-mode-mark}).@refill |
724 | 724 |
725 @item u | 725 @item u |
726 Unmark the file that the cursor is positioned on. If the cursor is on a | 726 Unmark the file that the cursor is positioned on. If the cursor is on a |
727 directory, all files in that directory are unmarked. | 727 directory, all files in that directory are unmarked |
728 (@code{cvs-mode-unmark}).@refill | 728 (@code{cvs-mode-unmark}).@refill |
729 | 729 |
730 @item M | 730 @item M |
731 Mark @emph{all} files in the buffer (@code{cvs-mode-mark-all-files}). | 731 Mark @emph{all} files in the buffer (@code{cvs-mode-mark-all-files}). |
732 | 732 |
741 Mark all files matching a regular expression | 741 Mark all files matching a regular expression |
742 (@code{cvs-mode-mark-matching-files}). | 742 (@code{cvs-mode-mark-matching-files}). |
743 | 743 |
744 @item S | 744 @item S |
745 Mark all files in a particular state, such as ``Modified'' or | 745 Mark all files in a particular state, such as ``Modified'' or |
746 ``Removed''. (@code{cvs-mode-mark-on-state}). | 746 ``Removed'' (@code{cvs-mode-mark-on-state}). |
747 | 747 |
748 @item T | 748 @item T |
749 Toggle use of marks for the next command (@code{cvs-mode-toggle-marks}). | 749 Toggle use of marks for the next command (@code{cvs-mode-toggle-marks}). |
750 @end table | 750 @end table |
751 | 751 |
802 | 802 |
803 If you are editing the files in your Emacs, an automatic | 803 If you are editing the files in your Emacs, an automatic |
804 @samp{revert-buffer} will be performed. (If the file contains | 804 @samp{revert-buffer} will be performed. (If the file contains |
805 @samp{$@asis{Id}$} keywords, @samp{cvs commit} will write a new file with | 805 @samp{$@asis{Id}$} keywords, @samp{cvs commit} will write a new file with |
806 the new values substituted. The auto-revert makes sure that you get | 806 the new values substituted. The auto-revert makes sure that you get |
807 them into your buffer). The revert will not occur if you have modified | 807 them into your buffer.) The revert will not occur if you have modified |
808 your buffer, or if @samp{cvs-auto-revert} is set to | 808 your buffer, or if @samp{cvs-auto-revert} is set to |
809 @samp{nil}. | 809 @samp{nil}. |
810 | 810 |
811 | 811 |
812 @node Editing files, Getting info about files, Committing changes, Commands | 812 @node Editing files, Getting info about files, Committing changes, Commands |
840 | 840 |
841 @item A | 841 @item A |
842 Invoke @samp{add-change-log-entry-other-window} to edit a | 842 Invoke @samp{add-change-log-entry-other-window} to edit a |
843 @file{ChangeLog} file. The @file{ChangeLog} file will be found in the | 843 @file{ChangeLog} file. The @file{ChangeLog} file will be found in the |
844 directory of the file the cursor points to, or in a parent of that | 844 directory of the file the cursor points to, or in a parent of that |
845 directory. (@code{cvs-mode-add-change-log-entry-other-window}).@refill | 845 directory (@code{cvs-mode-add-change-log-entry-other-window}).@refill |
846 @end table | 846 @end table |
847 | 847 |
848 | 848 |
849 @node Getting info about files, Adding and removing files, Editing files, Commands | 849 @node Getting info about files, Adding and removing files, Editing files, Commands |
850 @section Getting info about files | 850 @section Getting info about files |
922 @table @kbd | 922 @table @kbd |
923 @item U | 923 @item U |
924 If you have modified a file, and for some reason decide that you don't | 924 If you have modified a file, and for some reason decide that you don't |
925 want to keep the changes, you can undo them with this command. It works | 925 want to keep the changes, you can undo them with this command. It works |
926 by removing your working copy of the file and then getting the latest | 926 by removing your working copy of the file and then getting the latest |
927 version from the repository (@code{cvs-mode-undo-local-changes}. | 927 version from the repository (@code{cvs-mode-undo-local-changes}). |
928 @end table | 928 @end table |
929 | 929 |
930 | 930 |
931 @node Removing handled entries, Ignoring files, Undoing changes, Commands | 931 @node Removing handled entries, Ignoring files, Undoing changes, Commands |
932 @section Removing handled entries | 932 @section Removing handled entries |
1001 | 1001 |
1002 @table @kbd | 1002 @table @kbd |
1003 @item = | 1003 @item = |
1004 @itemx d = | 1004 @itemx d = |
1005 Display a @samp{cvs diff} between the selected files and the version | 1005 Display a @samp{cvs diff} between the selected files and the version |
1006 that they are based on. (@code{cvs-mode-diff}).@refill | 1006 that they are based on (@code{cvs-mode-diff}).@refill |
1007 | 1007 |
1008 @item d b | 1008 @item d b |
1009 If CVS finds a conflict while merging two versions of a file (during a | 1009 If CVS finds a conflict while merging two versions of a file (during a |
1010 @samp{cvs update}, @pxref{Updating the buffer}) it will save the | 1010 @samp{cvs update}, @pxref{Updating the buffer}) it will save the |
1011 original file in a file called @file{.#@var{file}.@var{version}} where | 1011 original file in a file called @file{.#@var{file}.@var{version}} where |
1015 With the @kbd{d b} command you can run a @samp{diff} on the files | 1015 With the @kbd{d b} command you can run a @samp{diff} on the files |
1016 @file{.#@var{file}.@var{version}} and @file{@var{file}}.@refill | 1016 @file{.#@var{file}.@var{version}} and @file{@var{file}}.@refill |
1017 | 1017 |
1018 @item d h | 1018 @item d h |
1019 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 |
1020 revision in the repository (the most recent version on the current | 1020 revision (the most recent version on the current |
1021 branch) (@code{cvs-mode-diff-head}).@refill | 1021 branch) in the repository (@code{cvs-mode-diff-head}).@refill |
1022 | 1022 |
1023 @item d r | 1023 @item d r |
1024 Display a @samp{cvs diff} between the base revision of the selected | 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 | 1025 files and the head revision in the repository. This displays the |
1026 changes anyone has committed to the repository since you last executed | 1026 changes anyone has committed to the repository since you last executed |
1027 "checkout", "update" or "commit". | 1027 "checkout", "update" or "commit" |
1028 (@code{cvs-mode-diff-repository}).@refill | 1028 (@code{cvs-mode-diff-repository}).@refill |
1029 | 1029 |
1030 @item d v | 1030 @item d v |
1031 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 |
1032 revision of the vendor branch in the repository. | 1032 revision of the vendor branch in the repository |
1033 (@code{cvs-mode-diff-vendor}).@refill | 1033 (@code{cvs-mode-diff-vendor}).@refill |
1034 | 1034 |
1035 @item d y | 1035 @item d y |
1036 Display a @samp{cvs diff} between the selected files and yesterday's | 1036 Display a @samp{cvs diff} between the selected files and yesterday's |
1037 head revision in the repository. | 1037 head revision in the repository |
1038 (@code{cvs-mode-diff-yesterday}).@refill | 1038 (@code{cvs-mode-diff-yesterday}).@refill |
1039 @end table | 1039 @end table |
1040 | 1040 |
1041 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 |
1042 with @code{cvs-invert-ignore-marks}. | 1042 with @code{cvs-invert-ignore-marks}. |
1080 @kindex O@r{--update files} | 1080 @kindex O@r{--update files} |
1081 | 1081 |
1082 @table @kbd | 1082 @table @kbd |
1083 @item O | 1083 @item O |
1084 Update all selected files with status @samp{Need-update} by running | 1084 Update all selected files with status @samp{Need-update} by running |
1085 @samp{cvs update} on them. (@code{cvs-mode-update}). | 1085 @samp{cvs update} on them (@code{cvs-mode-update}). |
1086 @end table | 1086 @end table |
1087 | 1087 |
1088 | 1088 |
1089 @node Tagging files, Miscellaneous commands, Updating files, Commands | 1089 @node Tagging files, Miscellaneous commands, Updating files, Commands |
1090 @section Tagging files | 1090 @section Tagging files |
1235 @cindex @file{.cvsignore} file, sorting | 1235 @cindex @file{.cvsignore} file, sorting |
1236 @cindex Automatically sorting @file{.cvsignore} | 1236 @cindex Automatically sorting @file{.cvsignore} |
1237 @cindex @samp{CVSROOT}, overriding | 1237 @cindex @samp{CVSROOT}, overriding |
1238 | 1238 |
1239 If you have an idea about any customization that would be handy but | 1239 If you have an idea about any customization that would be handy but |
1240 isn't present in this list, please tell me! | 1240 isn't present in this list, please tell us! |
1241 For info on how to reach me, see @ref{Bugs}.@refill | 1241 For info on how to reach us, see @ref{Bugs}.@refill |
1242 | 1242 |
1243 @table @samp | 1243 @table @samp |
1244 @item cvs-auto-remove-handled | 1244 @item cvs-auto-remove-handled |
1245 If this variable is set to any non-@code{nil} value, | 1245 If this variable is set to any non-@code{nil} value, |
1246 @samp{cvs-mode-remove-handled} will be called every time you check in | 1246 @samp{cvs-mode-remove-handled} will be called every time you check in |