[Emacs-diffs] /srv/bzr/emacs/trunk r102480: etc/NEWS: Document vc-update and vc-merge changes.

[Chong Yidong]

------------------------------------------------------------
revno: 102480
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Mon 2010-11-22 20:26:02 -0500
message:
  etc/NEWS: Document vc-update and vc-merge changes.
modified:
  etc/NEWS

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2010-11-21 19:46:48 +0000
+++ b/etc/NEWS  2010-11-23 01:26:02 +0000
@@ -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