]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: dce46a7) | patch
Refactor VC merging to fix a layer violation.
authorEric S. Raymond <esr@thyrsus.com>
Mon, 1 Dec 2014 16:41:45 +0000 (11:41 -0500)
committerEric S. Raymond <esr@thyrsus.com>
Mon, 1 Dec 2014 16:43:10 +0000 (11:43 -0500)
commitd17bae9039021b600ceaec93f2f0e888b12e523d
treef6ea0b50386d04f4c584415bed7c5221b872d4detree | snapshot
parentdce46a7484d9898cc161a8333ec71db3480b110bcommit | diff
Refactor VC merging to fix a layer violation.

* vc/vc.el, vc/vc-cvs.el, vc/vc-rcs.el, vc/vc-svn.el: The 'merge'
backend method of RCS/CVS/SVN is now 'merge-file', to contrast with
'merge-branch'. Prompting for merge revisions is pushed down to the
back ends; this fixes a layering violation that caused bad behavior
with SVN.
lisp/ChangeLog diff | blob | history
lisp/vc/vc-cvs.el diff | blob | history
lisp/vc/vc-rcs.el diff | blob | history
lisp/vc/vc-svn.el diff | blob | history
lisp/vc/vc.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.