[Emacs-commit] emacs/lisp vc-svn.el ChangeLog [EMACS_22_BASE]

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Stefan Monnier <monnier>        07/09/28 18:45:47

Modified files:
        lisp           : vc-svn.el ChangeLog 

Log message:
        (vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
        Used to try and automatically enabled smerge-mode in the presence of
        conflicts and to call `svn resolved' when the conflicts are gone.
        (vc-svn-parse-status): Remember the svn-specific status.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-svn.el?cvsroot=emacs&only_with_tag=EMACS_22_BASE&r1=1.34.2.1&r2=1.34.2.2
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&only_with_tag=EMACS_22_BASE&r1=1.11049.2.320&r2=1.11049.2.321