[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r107200: Small VC doc fixes
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r107200: Small VC doc fixes |
Date: |
Wed, 08 Feb 2012 22:25:18 -0800 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 107200
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-02-08 22:25:18 -0800
message:
Small VC doc fixes
* lisp/vc/log-view.el (log-view-toggle-entry-display):
* lisp/vc/vc.el (vc-merge, vc-pull): Doc fixes.
* etc/NEWS: Condense a few VC entries.
modified:
etc/NEWS
lisp/ChangeLog
lisp/vc/log-view.el
lisp/vc/vc.el
=== modified file 'etc/NEWS'
--- a/etc/NEWS 2012-02-09 06:02:33 +0000
+++ b/etc/NEWS 2012-02-09 06:25:18 +0000
@@ -859,21 +859,20 @@
+++
*** Support for pulling on distributed version control systems.
-`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.
+`C-x v +' (`vc-pull') runs a "pull" operation, if it is supported
+(currently with Bzr, Git, and Mercurial), 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'.
+++
*** Support for merging on distributed version control systems.
-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.
+The vc-merge command now runs a "merge" operation, if it is supported
+(currently with Bzr, Git, and Mercurial), to merge changes from
+another branch into the current one. It prompts for specifics, e.g. a
+merge source.
+++
*** New option `vc-revert-show-diff' controls whether `vc-revert'
@@ -882,14 +881,11 @@
+++
*** Log entries in some Log View buffers can be toggled to display a
longer description by typing RET (log-view-toggle-entry-display).
+This is currently supported for Bzr, Git, and Mercurial (to support
+another backend, define a `log-view-expanded-log-entry-function').
In the Log View buffers made by `C-x v L' (vc-print-root-log), you can
use this to display the full log entry for the revision at point.
-**** Currently supported for Bzr, Git, and Mercurial.
-
-**** Packages using Log View mode can enable this functionality by
-binding `log-view-expanded-log-entry-function' to a suitable function.
-
+++
*** New command `vc-ediff' allows visual comparison of two revisions
of a file similar to `vc-diff', but using ediff backend.
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-02-09 03:29:41 +0000
+++ b/lisp/ChangeLog 2012-02-09 06:25:18 +0000
@@ -1,5 +1,8 @@
2012-02-09 Glenn Morris <address@hidden>
+ * vc/log-view.el (log-view-toggle-entry-display):
+ * vc/vc.el (vc-merge, vc-pull): Doc fixes.
+
* mail/emacsbug.el (report-emacs-bug-can-use-osx-open)
(report-emacs-bug-can-use-xdg-email):
(report-emacs-bug-insert-to-mailer): Doc fixes.
=== modified file 'lisp/vc/log-view.el'
--- a/lisp/vc/log-view.el 2012-01-19 07:21:25 +0000
+++ b/lisp/vc/log-view.el 2012-02-09 06:25:18 +0000
@@ -376,6 +376,8 @@
marked-list)))
(defun log-view-toggle-entry-display ()
+ "If possible, expand the current Log View entry.
+This calls `log-view-expanded-log-entry-function' to do the work."
(interactive)
;; Don't do anything unless `log-view-expanded-log-entry-function'
;; is defined in this mode.
=== modified file 'lisp/vc/vc.el'
--- a/lisp/vc/vc.el 2012-01-25 00:07:04 +0000
+++ b/lisp/vc/vc.el 2012-02-09 06:25:18 +0000
@@ -1889,6 +1889,7 @@
;;;###autoload
(defun vc-merge ()
"Perform a version control merge operation.
+You must be visiting a version controlled file, or in a `vc-dir' buffer.
On a distributed version control system, this runs a \"merge\"
operation to incorporate changes from another branch onto the
current branch, prompting for an argument list.
@@ -2366,6 +2367,7 @@
;;;###autoload
(defun vc-pull (&optional arg)
"Update the current fileset or branch.
+You must be visiting a version controlled file, or in a `vc-dir' buffer.
On a distributed version control system, this runs a \"pull\"
operation to update the current branch, prompting for an argument
list if required. Optional prefix ARG forces a prompt.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r107200: Small VC doc fixes,
Glenn Morris <=