Mercurial > emacs

changeset 111680:2b1a10988f96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
etc/NEWS: Document vc-update and vc-merge changes.
author Chong Yidong <cyd@stupidchicken.com>
date Mon, 22 Nov 2010 20:26:02 -0500
parents 33ed3cf8260b
children 1a0c949aa8d5
files etc/NEWS
diffstat 1 files changed, 18 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/etc/NEWS	Mon Nov 22 20:15:08 2010 -0500
+++ b/etc/NEWS	Mon Nov 22 20:26:02 2010 -0500
@@ -542,6 +542,24 @@
 *** The following access methods are discontinued: "ssh1_old",
 "ssh2_old", "scp1_old", "scp2_old" and "fish".
 
+** VC and related modes
+
+*** Support for pulling on distributed version control systems.
+The vc-update command now runs a "pull" operation, if it is supported.
+This updates the current branch from upstream.  A prefix argument
+means to prompt the user for command specifics, e.g. a pull location.
+
+**** vc-pull is an alias for vc-update.
+
+**** Currently supported by Bzr.
+
+*** 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.  A prefix argument
+means to prompt the user for command specifics, e.g. a merge location.
+
+**** Currently supported by Bzr.
+
 
 * New Modes and Packages in Emacs 24.1