aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric S. Raymond2007-10-10 15:03:07 +0000
committerEric S. Raymond2007-10-10 15:03:07 +0000
commitd4f69e77e16bef3fa44613c8d733feceb2f59824 (patch)
tree1dc3accb7b0f4e108076bbc5060dd4a634c83d6f
parent4a11b6b51a38415f1136e3edd23febde0732c67d (diff)
downloademacs-d4f69e77e16bef3fa44613c8d733feceb2f59824.tar.gz
emacs-d4f69e77e16bef3fa44613c8d733feceb2f59824.zip
Fix sectrioning errors in files.texi.
-rw-r--r--doc/emacs/files.texi39
1 files changed, 20 insertions, 19 deletions
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 92bd9c1bd49..5ecd161a911 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1261,10 +1261,10 @@ this section if you are already familiar with the version control system
1261you want to use. 1261you want to use.
1262 1262
1263@menu 1263@menu
1264* Why Version Control?:: Understanding the problems it addresses 1264* Why Version Control?:: Understanding the problems it addresses
1265* Version Systems:: Supported version control back-end systems. 1265* Version Control Systems:: Supported version control back-end systems.
1266* VC Concepts:: Words and concepts related to version control. 1266* VCS Concepts:: Words and concepts related to version control.
1267* Types of Log File:: The per-file VC log in contrast to the ChangeLog. 1267* Types of Log File:: The VCS log in contrast to the ChangeLog.
1268@end menu 1268@end menu
1269 1269
1270@node Why Version Control? 1270@node Why Version Control?
@@ -1287,7 +1287,7 @@ change to it. Even for a programmer working solo change histories
1287are an important aid to memory; for a multi-person project they 1287are an important aid to memory; for a multi-person project they
1288become a vitally important form of communication among developers. 1288become a vitally important form of communication among developers.
1289 1289
1290@node Version Systems 1290@node Version Control Systems
1291@subsubsection Supported Version Control Systems 1291@subsubsection Supported Version Control Systems
1292 1292
1293@cindex back end (version control) 1293@cindex back end (version control)
@@ -1368,11 +1368,11 @@ be done from the command line.
1368@cindex Mercurial 1368@cindex Mercurial
1369 Mercurial is a distributed version-control systems broadly 1369 Mercurial is a distributed version-control systems broadly
1370resembling GNU Arch and git, with atomic fileset commits and 1370resembling GNU Arch and git, with atomic fileset commits and
1371rename/move histories. Like git it is fully decventralized. 1371rename/move histories. Like git it is fully decentralized.
1372VC fully supports Mercurial, except for repository sync operations 1372VC fully supports Mercurial, except for repository sync operations
1373which still need to be done from the command line. 1373which still need to be done from the command line.
1374 1374
1375@node VC Concepts 1375@node VCS Concepts
1376@subsubsection Concepts of Version Control 1376@subsubsection Concepts of Version Control
1377 1377
1378@cindex repository 1378@cindex repository
@@ -1448,7 +1448,7 @@ both locking and merging version control and tries to hide the differences
1448between them as much as possible. 1448between them as much as possible.
1449 1449
1450@cindex files versus changesets. 1450@cindex files versus changesets.
1451 On SCCS. RCS, CVS, and other early version-control systems, checkins 1451 On SCCS, RCS, CVS, and other early version-control systems, checkins
1452and other operations are @dfn{file-based}; each file has its own 1452and other operations are @dfn{file-based}; each file has its own
1453@dfn{master file} with its own comment- and revision history separate 1453@dfn{master file} with its own comment- and revision history separate
1454from that of all other files in the system. Later systems, beginning 1454from that of all other files in the system. Later systems, beginning
@@ -1475,7 +1475,6 @@ systems and a bit archaic; nowadays those operations are usually called
1475``commit'' and ``update''. 1475``commit'' and ``update''.
1476 1476
1477@cindex centralized vs. decentralized 1477@cindex centralized vs. decentralized
1478
1479 Early version-control systems were designed around a @dfn{centralized} 1478 Early version-control systems were designed around a @dfn{centralized}
1480model in which each project has only one repository used by all 1479model in which each project has only one repository used by all
1481developers. SCCS, RCS, CVS, and Subversion share this kind of model. 1480developers. SCCS, RCS, CVS, and Subversion share this kind of model.
@@ -1584,6 +1583,15 @@ system, but is usually not excessive.
1584@node Basic VC Editing 1583@node Basic VC Editing
1585@subsection Basic Editing under Version Control 1584@subsection Basic Editing under Version Control
1586 1585
1586@menu
1587* Selecting a fileset:: Choosing a set of files to operate on
1588* Doing the next logical thing:: Stepping forward in the development cycle
1589* VC with a locking VCS:: RCS in its default mode, SCCS, and optionally CVS.
1590* VC with a merging VCS:: Without locking: default mode for CVS.
1591* Advanced C-x v v:: Advanced features available with a prefix argument.
1592* Log Buffer:: Features available in log entry buffers.
1593@end menu
1594
1587@node Selecting a fileset 1595@node Selecting a fileset
1588@subsubsection Choosing the scope of your command 1596@subsubsection Choosing the scope of your command
1589 1597
@@ -1647,14 +1655,7 @@ accidentally edit a file without properly checking it out first. To
1647achieve this, bind the key @kbd{C-x C-q} to @kbd{vc-toggle-read-only} 1655achieve this, bind the key @kbd{C-x C-q} to @kbd{vc-toggle-read-only}
1648in your @file{~/.emacs} file. (@xref{Init Rebinding}.) 1656in your @file{~/.emacs} file. (@xref{Init Rebinding}.)
1649 1657
1650@menu 1658@node VC with a locking VCS
1651* VC with Locking:: RCS in its default mode, SCCS, and optionally CVS.
1652* Without Locking:: Without locking: default mode for CVS.
1653* Advanced C-x v v:: Advanced features available with a prefix argument.
1654* Log Buffer:: Features available in log entry buffers.
1655@end menu
1656
1657@node VC with Locking
1658@subsubsection Basic Version Control with Locking 1659@subsubsection Basic Version Control with Locking
1659 1660
1660 If locking is used for the file (as with SCCS, and RCS in its default 1661 If locking is used for the file (as with SCCS, and RCS in its default
@@ -1685,8 +1686,8 @@ formerly locked the file, to inform him of what has happened.
1685 These rules also apply when you use CVS in locking mode, except 1686 These rules also apply when you use CVS in locking mode, except
1686that there is no such thing as stealing a lock. 1687that there is no such thing as stealing a lock.
1687 1688
1688@node Without Locking 1689@node VC with a merging VCS
1689@subsubsection Basic Version Control without Locking 1690@subsubsection Basic Version Control with Merging
1690 1691
1691 When your version-control system is merging-based rather than 1692 When your version-control system is merging-based rather than
1692locking-based---the default for CVS and Subversion, and the way GNU 1693locking-based---the default for CVS and Subversion, and the way GNU