Mercurial > emacs
comparison man/files.texi @ 49600:23a1cea22d13
Trailing whitespace deleted.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Tue, 04 Feb 2003 14:56:31 +0000 |
parents | c7709b58cc74 |
children | bfd5da2ea577 d7ddb3e565de |
comparison
equal
deleted
inserted
replaced
49599:5ade352e8d1c | 49600:23a1cea22d13 |
---|---|
1081 links point to directories. | 1081 links point to directories. |
1082 | 1082 |
1083 If you visit two names for the same file, normally Emacs makes | 1083 If you visit two names for the same file, normally Emacs makes |
1084 two different buffers, but it warns you about the situation. | 1084 two different buffers, but it warns you about the situation. |
1085 | 1085 |
1086 @vindex find-file-existing-other-name | 1086 @vindex find-file-existing-other-name |
1087 @vindex find-file-suppress-same-file-warnings | 1087 @vindex find-file-suppress-same-file-warnings |
1088 Normally, if you visit a file which Emacs is already visiting under | 1088 Normally, if you visit a file which Emacs is already visiting under |
1089 a different name, Emacs displays a message in the echo area and uses | 1089 a different name, Emacs displays a message in the echo area and uses |
1090 the existing buffer visiting that file. This can happen on systems | 1090 the existing buffer visiting that file. This can happen on systems |
1091 that support symbolic links, or if you use a long file name on a | 1091 that support symbolic links, or if you use a long file name on a |
1110 @cindex version control | 1110 @cindex version control |
1111 | 1111 |
1112 @dfn{Version control systems} are packages that can record multiple | 1112 @dfn{Version control systems} are packages that can record multiple |
1113 versions of a source file, usually storing the unchanged parts of the | 1113 versions of a source file, usually storing the unchanged parts of the |
1114 file just once. Version control systems also record history information | 1114 file just once. Version control systems also record history information |
1115 such as the creation time of each version, who created it, and a | 1115 such as the creation time of each version, who created it, and a |
1116 description of what was changed in that version. | 1116 description of what was changed in that version. |
1117 | 1117 |
1118 The Emacs version control interface is called VC. Its commands work | 1118 The Emacs version control interface is called VC. Its commands work |
1119 with three version control systems---RCS, CVS, and SCCS. The GNU | 1119 with three version control systems---RCS, CVS, and SCCS. The GNU |
1120 project recommends RCS and CVS, which are free software and available | 1120 project recommends RCS and CVS, which are free software and available |
1237 (@pxref{CVS Options}). | 1237 (@pxref{CVS Options}). |
1238 | 1238 |
1239 @node Types of Log File | 1239 @node Types of Log File |
1240 @subsubsection Types of Log File | 1240 @subsubsection Types of Log File |
1241 @cindex types of log file | 1241 @cindex types of log file |
1242 @cindex log File, types of | 1242 @cindex log File, types of |
1243 @cindex version control log | 1243 @cindex version control log |
1244 | 1244 |
1245 GNU projects under a revision control system generally possess | 1245 GNU projects under a revision control system generally possess |
1246 @emph{two} types of log for changes. One is the per-file log | 1246 @emph{two} types of log for changes. One is the per-file log |
1247 maintained by the revision control system: each time you check in a | 1247 maintained by the revision control system: each time you check in a |
1308 * VC with Locking:: RCS in its default mode, SCCS, and optionally CVS. | 1308 * VC with Locking:: RCS in its default mode, SCCS, and optionally CVS. |
1309 * Without Locking:: Without locking: default mode for CVS. | 1309 * Without Locking:: Without locking: default mode for CVS. |
1310 * Advanced C-x v v:: Advanced features available with a prefix argument. | 1310 * Advanced C-x v v:: Advanced features available with a prefix argument. |
1311 * Log Buffer:: Features available in log entry buffers. | 1311 * Log Buffer:: Features available in log entry buffers. |
1312 @end menu | 1312 @end menu |
1313 | 1313 |
1314 @node VC with Locking | 1314 @node VC with Locking |
1315 @subsubsection Basic Version Control with Locking | 1315 @subsubsection Basic Version Control with Locking |
1316 | 1316 |
1317 If locking is used for the file (as with SCCS, and RCS in its default | 1317 If locking is used for the file (as with SCCS, and RCS in its default |
1318 mode), @kbd{C-x v v} can either lock a file or check it in: | 1318 mode), @kbd{C-x v v} can either lock a file or check it in: |
1319 | 1319 |
1538 | 1538 |
1539 @menu | 1539 @menu |
1540 * Registering:: Putting a file under version control. | 1540 * Registering:: Putting a file under version control. |
1541 * VC Status:: Viewing the VC status of files. | 1541 * VC Status:: Viewing the VC status of files. |
1542 * VC Undo:: Cancelling changes before or after check-in. | 1542 * VC Undo:: Cancelling changes before or after check-in. |
1543 * VC Dired Mode:: Listing files managed by version control. | 1543 * VC Dired Mode:: Listing files managed by version control. |
1544 * VC Dired Commands:: Commands to use in a VC Dired buffer. | 1544 * VC Dired Commands:: Commands to use in a VC Dired buffer. |
1545 @end menu | 1545 @end menu |
1546 | 1546 |
1547 @node Registering | 1547 @node Registering |
1548 @subsubsection Registering a File for Version Control | 1548 @subsubsection Registering a File for Version Control |
1805 | 1805 |
1806 @menu | 1806 @menu |
1807 * Switching Branches:: How to get to another existing branch. | 1807 * Switching Branches:: How to get to another existing branch. |
1808 * Creating Branches:: How to start a new branch. | 1808 * Creating Branches:: How to start a new branch. |
1809 * Merging:: Transferring changes between branches. | 1809 * Merging:: Transferring changes between branches. |
1810 * Multi-User Branching:: Multiple users working at multiple branches | 1810 * Multi-User Branching:: Multiple users working at multiple branches |
1811 in parallel. | 1811 in parallel. |
1812 @end menu | 1812 @end menu |
1813 | 1813 |
1814 @node Switching Branches | 1814 @node Switching Branches |
1815 @subsubsection Switching between Branches | 1815 @subsubsection Switching between Branches |
2223 | 2223 |
2224 This section explains the less-frequently-used features of VC. | 2224 This section explains the less-frequently-used features of VC. |
2225 | 2225 |
2226 @menu | 2226 @menu |
2227 * Change Logs and VC:: Generating a change log file from log entries. | 2227 * Change Logs and VC:: Generating a change log file from log entries. |
2228 * Renaming and VC:: A command to rename both the source and master | 2228 * Renaming and VC:: A command to rename both the source and master |
2229 file correctly. | 2229 file correctly. |
2230 * Version Headers:: Inserting version control headers into working files. | 2230 * Version Headers:: Inserting version control headers into working files. |
2231 @end menu | 2231 @end menu |
2232 | 2232 |
2233 @node Change Logs and VC | 2233 @node Change Logs and VC |