]> code.delx.au - gnu-emacs/commit
Initial support for unified DVCS pull and merge.
authorChong Yidong <cyd@stupidchicken.com>
Tue, 23 Nov 2010 01:15:08 +0000 (20:15 -0500)
committerChong Yidong <cyd@stupidchicken.com>
Tue, 23 Nov 2010 01:15:08 +0000 (20:15 -0500)
commit2c3160c54e5e58ebd9cf3b2c499a55d43b0271cc
treed11648c6733cd4179018ce88478ee0bc96f52535
parentef6a29070d822e6b35d6b978d2f070f8a5854b30
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.
lisp/ChangeLog
lisp/vc/vc-bzr.el
lisp/vc/vc.el