Mercurial > emacs
view BUGS @ 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 | ac52af4a044c |
children |
line wrap: on
line source
If you think you may have found a bug in GNU Emacs, please read the Bugs section of the Emacs manual for advice on (1) how to tell when to report a bug, and (2) how to write a useful bug report and what information it needs to have. You can read the read the Bugs section of the manual from inside Emacs. Start Emacs, do C-h i to enter Info, then m Emacs RET to get to the Emacs manual, then m Bugs RET to get to the section on bugs. Or you can use the standalone Info program in a like manner. (Standalone Info is part of the Texinfo distribution, not part of the Emacs distribution.) Printed copies of the Emacs manual can be purchased from the Free Software Foundation's online store at <http://shop.fsf.org/>. If necessary, you can read the manual without an info program: cat info/emacs* | more "+/^File: emacs, Node: Bugs," Please first check the file etc/PROBLEMS (e.g. with C-h C-p in Emacs) to make sure it isn't a known issue.