Commit 2edef1a0 authored by Chong Yidong's avatar Chong Yidong

More updates for VC documentation.

* doc/emacs/maintaining.texi (VCS Concepts): Add "working tree" terminology.
(Old Revisions): Use it.
(VCS Repositories): Add "distributed" terminology.
(Log Buffer): Remove duplicate description
about changesets.  Fix "current VC fileset" ambiguity.
(Multi-User Branching): Node deleted.
(Branches, Switching Branches): Discuss decentralized version control systems.
(VC Pull): New node.
(Merging): Document merging on decentralized systems.
(Creating Branches): Note that this is specific to CVS and related systems.
parent 1154d12e
2011-12-20 Chong Yidong <cyd@gnu.org>
* maintaining.texi (VCS Concepts): Add "working tree" terminology.
(Old Revisions): Use it.
(VCS Repositories): Add "distributed" terminology.
(Log Buffer): Remove duplicate description
about changesets. Fix "current VC fileset" ambiguity.
(Multi-User Branching): Node deleted.
(Branches, Switching Branches): Discuss decentralized version
control systems.
(VC Pull): New node.
(Merging): Document merging on decentralized systems.
(Creating Branches): Note that this is specific to CVS and related
systems.
2011-12-19 Chong Yidong <cyd@gnu.org>
* maintaining.texi (VCS Merging, VCS Changesets): Index entries.
......
......@@ -776,10 +776,9 @@ VC Directory Mode
Multiple Branches of a File
* Switching Branches:: How to get to another existing branch.
* Creating Branches:: How to start a new branch.
* VC Pull:: Updating a branch from another branch.
* Merging:: Transferring changes between branches.
* Multi-User Branching:: Multiple users working at multiple branches
in parallel.
* Creating Branches:: How to start a new branch.
Remote Repositories
......
This diff is collapsed.
......@@ -495,14 +495,7 @@ a mechanism, except GNU Arch.
VC does not normally use the information contained in these headers.
The exception is RCS---with RCS, version headers are sometimes more
reliable than the master file to determine which version of the file
you are editing. Note that in a multi-branch environment, version
headers are necessary to make VC behave correctly
@iftex
(@pxref{Multi-User Branching,,,emacs, the Emacs Manual}).
@end iftex
@ifnottex
(@pxref{Multi-User Branching}).
@end ifnottex
you are editing.
Searching for RCS version headers is controlled by the variable
@code{vc-consult-headers}. If it is non-@code{nil} (the default),
......
......@@ -833,19 +833,21 @@ controlling the degree of parallelism.
** VC and related modes
+++
*** Support for pulling on distributed version control systems.
The vc-pull command runs a "pull" operation, if it is supported.
This updates the current branch from upstream. A prefix argument
means to prompt the user for specifics, e.g. a pull location.
`C-x v +' (`vc-pull') runs a "pull" operation, if it is supported, to
update the current branch and working tree. A prefix argument means
to prompt the user for specifics, e.g. a pull location.
**** `vc-update' is now an alias for `vc-pull'.
**** Currently supported by Bzr, Git, and Mercurial.
+++
*** Support for merging on distributed version control systems.
The vc-merge command now runs a "merge" operation, if it is supported.
This merges another branch into the current one. This command prompts
the user for specifics, e.g. a merge source.
The vc-merge command now runs a "merge" operation, if it is supported,
to merge changes from another branch into the current one. It prompts
for specifics, e.g. a merge source.
**** Currently supported for Bzr, Git, and Mercurial.
......
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