| commit | d17bae9039021b600ceaec93f2f0e888b12e523d | |
| author | Eric S. Raymond <esr@thyrsus.com> | |
| Mon, 1 Dec 2014 16:41:45 +0000 (1 11:41 -0500) | ||
| committer | Eric S. Raymond <esr@thyrsus.com> | |
| Mon, 1 Dec 2014 16:43:10 +0000 (1 11:43 -0500) | ||
| tree | f6ea0b50386d04f4c584415bed7c5221b872d4de | treesnapshot (tar.gz zip) |
| parent | dce46a7484d9898cc161a8333ec71db3480b110b | commitdiff |
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.
* 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 | diffblobblamehistory | |
| lisp/vc/vc-cvs.el | diffblobblamehistory | |
| lisp/vc/vc-rcs.el | diffblobblamehistory | |
| lisp/vc/vc-svn.el | diffblobblamehistory | |
| lisp/vc/vc.el | diffblobblamehistory |