Mercurial > emacs
view etc/ORDERS @ 111679:33ed3cf8260b
Initial support for unified DVCS pull and merge.
* lisp/vc/vc-bzr.el (vc-bzr-admin-branchconf, vc-bzr-history): New vars.
(vc-bzr--branch-conf, vc-bzr-async-command, vc-bzr-pull)
(vc-bzr-merge-branch): New functions, implementing merge-branch
and pull operations.
* lisp/vc/vc.el (vc-merge): Use vc-BACKEND-merge-branch if available.
Accept optional prefix arg meaning to prompt for a command.
(vc-update): Use vc-BACKEND-pull if available. Accept optional
prefix arg meaning to prompt for a command.
(vc-pull): Alias for vc-update.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Mon, 22 Nov 2010 20:15:08 -0500 |
parents | ea7513e99331 |
children |
line wrap: on
line source
Printed copies of the GNU Emacs Manual, the Emacs Lisp Reference Manual, "Programming in Emacs Lisp: An Introduction", and other materials can be ordered directly from the Free Software Foundation. For more information, see the online store at <http://shop.fsf.org/>. Your purchases will help support further development of Emacs and other free software programs. You can also make tax-deductible donations to the Free Software Foundation, a not-for-profit organization (assuming you pay US taxes) - see <https://my.fsf.org/donate/>.