Commit d3098e1e authored by Chong Yidong's avatar Chong Yidong
Browse files

More updates for VC documentation.

* files.texi (Misc File Ops): Mention vc-rename-file.

* maintaining.texi (Advanced C-x v v): Use fileset terminology.
(VC With A Merging VCS, VC Change Log): Add xref to VC Pull node.
(VC Pull): Mention vc-log-incoming.
(Log Buffer): Add CVS/RCS only disclaimer.

* vc1-xtra.texi (Remote Repositories): Update introduction.
(Local Version Control): Node deleted (obsolete with DVCSes).
(Remote Repositories, Version Backups): Node deleted.  Move
documentation of vc-cvs-stay-local to CVS Options.
(CVS Options): Reduce verbosity of description of obscure CVS
locking feature.
(Making Revision Tags, Revision Tag Caveats): Merge into Revision
Tags node.
(Revision Tags): Move under Miscellaneous VC subsection.
(Change Logs and VC): Note that this is wrong for DVCSs.
De-document log entry manipulating features.
(Renaming and VC): Describe how it works on modern VCSes.

* programs.texi (Custom C Indent): Add index entries.
parent 204ee57f
2011-12-21 Chong Yidong <cyd@gnu.org>
* maintaining.texi (Advanced C-x v v): Use fileset terminology.
(VC With A Merging VCS, VC Change Log): Add xref to VC Pull node.
(VC Pull): Mention vc-log-incoming.
(Log Buffer): Add CVS/RCS only disclaimer.
* vc1-xtra.texi (Remote Repositories): Update introduction.
(Local Version Control): Node deleted (obsolete with DVCSes).
(Remote Repositories, Version Backups): Node deleted. Move
documentation of vc-cvs-stay-local to CVS Options.
(CVS Options): Reduce verbosity of description of obscure CVS
locking feature.
(Making Revision Tags, Revision Tag Caveats): Merge into Revision
Tags node.
(Revision Tags): Move under Miscellaneous VC subsection.
(Change Logs and VC): Note that this is wrong for DVCSs.
De-document log entry manipulating features.
(Renaming and VC): Describe how it works on modern VCSes.
* files.texi (Misc File Ops): Mention vc-rename-file.
* programs.texi (Custom C Indent): Add index entries.
2011-12-20 Alan Mackenzie <acm@muc.de>
* programs.texi (Motion in C): Update the description of C-M-a and
......
......@@ -747,7 +747,6 @@ Version Control
* VC Undo:: Canceling changes before or after committing.
* VC Directory Mode:: Listing files managed by version control.
* Branches:: Multiple lines of development.
* Remote Repositories:: Efficient access to remote CVS servers.
* Revision Tags:: Symbolic names for revisions.
* Miscellaneous VC:: Various other commands and features of VC.
* Customizing VC:: Variables that change VC's behavior.
......@@ -780,21 +779,12 @@ Multiple Branches of a File
* Merging:: Transferring changes between branches.
* Creating Branches:: How to start a new branch.
Remote Repositories
* Version Backups:: Keeping local copies of repository versions.
* Local Version Control:: Using another version system for local editing.
Revision Tags
* Making Revision Tags:: The tag facilities.
* Revision Tag Caveats:: Things to be careful of when using tags.
Miscellaneous Commands and Features of VC
* Change Logs and VC:: Generating a change log file from log entries.
* Renaming and VC:: A command to rename both the source and master
file correctly.
* Revision Tags:: Symbolic names for revisions.
* Version Headers:: Inserting version control headers into working files.
Customizing VC
......
......@@ -1498,6 +1498,7 @@ it creates a copy of the @var{old} directory and puts it in @var{new}.
If @var{new} is not an existing directory, it copies all the contents
of @var{old} into a new directory named @var{new}.
@cindex renaming files
@findex rename-file
@kbd{M-x rename-file} reads two file names @var{old} and @var{new}
using the minibuffer, then renames file @var{old} as @var{new}. If
......@@ -1512,6 +1513,13 @@ RET /tmp RET} renames @file{~/foo} to @file{/tmp/foo}. The same rule
applies to all the remaining commands in this section. All of them
ask for confirmation when the new file name already exists, too.
@ifnottex
Note that if a file is under version control (@pxref{Version
Control}), you normally ought to rename it via the version control
system instead, using @kbd{M-x vc-rename-file}. @xref{Renaming and
VC}.
@end ifnottex
@findex add-name-to-file
@cindex hard links (creation)
@kbd{M-x add-name-to-file} adds an additional name to an existing
......
......@@ -56,8 +56,6 @@ variable @code{vc-handled-backends} to @code{nil}
* VC Directory Mode:: Listing files managed by version control.
* Branches:: Multiple lines of development.
@ifnottex
* Remote Repositories:: Efficient access to remote CVS servers.
* Revision Tags:: Symbolic names for revisions.
* Miscellaneous VC:: Various other commands and features of VC.
* Customizing VC:: Variables that change VC's behavior.
@end ifnottex
......@@ -482,10 +480,11 @@ commit. @xref{Log Buffer}.
If committing to a shared repository, the commit may fail if the
repository that has been changed since your last update. In that
case, you must perform an update before trying again. If using a
decentralized version control system, use @kbd{C-x v +} or @kbd{C-x v
m} (@pxref{Merging}). If using a centralized version control system,
type @kbd{C-x v v} again to merge in the repository changes.
case, you must perform an update before trying again. On a
decentralized version control system, use @kbd{C-x v +} (@pxref{VC
Pull}) or @kbd{C-x v m} (@pxref{Merging}). On a centralized version
control system, type @kbd{C-x v v} again to merge in the repository
changes.
@item
Finally, if you are using a centralized version control system, check
......@@ -557,31 +556,27 @@ to do the operation.
@itemize @bullet
@item
If the file is modified (or locked), you can specify the revision ID
to use for the new version that you commit. This is one way to create
a new branch (@pxref{Branches}).
@cindex specific version control system
You can specify the name of a version control system. This is useful
if the fileset can be managed by more than one version control system,
and Emacs fails to detect the correct one.
@item
If the file is not modified (and unlocked), you can specify the
revision to select; this lets you start working from an older
revision, or on another branch. If you do not enter any revision,
that takes you to the highest (``head'') revision on the current
branch; therefore @kbd{C-u C-x v v @key{RET}} is a convenient way to
get the latest version of a file from the repository.
Otherwise, if using CVS or RCS, you can specify a revision ID.
@item
@cindex specific version control system
Instead of the revision ID, you can also specify the name of a
version control system. This is useful when one file is being managed
with two version control systems at the same time
@iftex
(@pxref{Local Version Control,,,emacs-xtra, Specialized Emacs
Features}).
@end iftex
@ifnottex
(@pxref{Local Version Control}).
@end ifnottex
If the fileset is modified (or locked), this makes Emacs commit with
that revision ID. You can create a new branch by supplying an
appropriate revision ID (@pxref{Branches}).
If the fileset is unmodified (and unlocked), this checks the specified
revision into the working tree. You can also specify a revision on
another branch by giving its revision or branch ID (@pxref{Switching
Branches}). An empty argument (i.e.@: @kbd{C-u C-x v v @key{RET}})
checks out the latest (``head'') revision on the current branch.
This signals an error on a decentralized version control system.
Those systems do not let you specify your own revision IDs, nor do
they use the concept of ``checking out'' individual files.
@end itemize
@node Log Buffer
......@@ -646,8 +641,9 @@ the @samp{*vc-log*} buffer. If the topmost item in each
this command searches that item for entries matching the file(s) to be
committed, and inserts them.
@ifnottex
@xref{Change Logs and VC}, for the opposite way of
working---generating ChangeLog entries from the Log Edit buffer.
If you are using CVS or RCS, see @ref{Change Logs and VC}, for the
opposite way of working---generating ChangeLog entries from the Log
Edit buffer.
@end ifnottex
To abort a commit, just @strong{don't} type @kbd{C-c C-c} in that
......@@ -935,13 +931,13 @@ revision at point. A second @key{RET} hides it again.
(@code{vc-log-incoming}) command displays a log buffer showing the
changes that will be applied, the next time you run the version
control system's ``pull'' command to get new revisions from another
repository. This other repository is the default one from which
changes are pulled, as defined by the version control system; with a
prefix argument, @code{vc-log-incoming} prompts for a specific
repository. Similarly, @kbd{C-x v O} (@code{vc-log-outgoing}) shows
the changes that will be sent to another repository, the next time you
run the ``push'' command; with a prefix argument, it prompts for a
specific destination repository.
repository (@pxref{VC Pull}). This other repository is the default
one from which changes are pulled, as defined by the version control
system; with a prefix argument, @code{vc-log-incoming} prompts for a
specific repository. Similarly, @kbd{C-x v O}
(@code{vc-log-outgoing}) shows the changes that will be sent to
another repository, the next time you run the ``push'' command; with a
prefix argument, it prompts for a specific destination repository.
In the @samp{*vc-change-log*} buffer, you can use the following keys
to move between the logs of revisions and of files, and to examine and
......@@ -1339,8 +1335,8 @@ command to use, which lets you specify where to pull changes from.
Otherwise, it pulls from a default location determined by the version
control system.
Amongst decentralized version control systems, @kbd{C-x v +}
currently supports only Bazaar, Git, and Mercurial. On Bazaar, it
Amongst decentralized version control systems, @kbd{C-x v +} is
currently supported only by Bazaar, Git, and Mercurial. On Bazaar, it
calls @command{bzr pull} for ordinary branches (to pull from a master
branch into a mirroring branch), and @command{bzr update} for a bound
branch (to pull from a central repository). On Git, it calls
......@@ -1349,6 +1345,10 @@ it into the current branch. On Mercurial, it calls @command{hg pull
-u} to fetch changesets from the default remote repository and update
the working directory.
Prior to pulling, you can use @kbd{C-x v I} (@code{vc-log-incoming})
to view a log buffer of the changes to be applied. @xref{VC Change
Log}.
On a centralized version control system like CVS, @kbd{C-x v +}
updates the current VC fileset from the repository.
......
......@@ -606,12 +606,13 @@ information on customizing indentation for C and related modes,
including how to override parts of an existing style and how to define
your own styles.
As an alternative to specifying a style, you can get Emacs to
@dfn{guess} the style by scanning a code buffer which is already
formatted. To do this, call @kbd{M-x c-guess} in your sample buffer.
You can then apply this guessed style to other buffers with @kbd{M-x
@findex c-guess
@findex c-guess-install
As an alternative to specifying a style, you can tell Emacs to guess
a style by typing @kbd{M-x c-guess} in a sample code buffer. You can
then apply the guessed style to other buffers with @kbd{M-x
c-guess-install}. @xref{Guessing the Style,,, ccmode, the CC Mode
Manual}, for more details about this mechanism.
Manual}, for details.
@node Parentheses
@section Commands for Editing with Parentheses
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment