diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-11-22 20:15:08 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-11-22 20:15:08 -0500 |
| commit | 2c3160c54e5e58ebd9cf3b2c499a55d43b0271cc (patch) | |
| tree | d11648c6733cd4179018ce88478ee0bc96f52535 /lisp/emacs-lisp | |
| parent | ef6a29070d822e6b35d6b978d2f070f8a5854b30 (diff) | |
| download | emacs-2c3160c54e5e58ebd9cf3b2c499a55d43b0271cc.tar.gz emacs-2c3160c54e5e58ebd9cf3b2c499a55d43b0271cc.tar.bz2 emacs-2c3160c54e5e58ebd9cf3b2c499a55d43b0271cc.zip | |
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.
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions