(vc-backend-merge-news): Force to refetch the

properties after the merge.

diff --git a/lisp/vc.el b/lisp/vc.el
index cc27216dd6936a615be1d0aab50053102ad71b04..80318b8c93dbd7a41b5f044c32696abf0e8f742e 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1897,7 +1897,11 @@ From a program, any arguments are passed to the `rcs2log' script."
    file
    (error "vc-backend-merge-news not meaningful for SCCS files") ;SCCS
    (error "vc-backend-merge-news not meaningful for RCS files")        ;RCS
-   (vc-do-command 1 "cvs" file 'WORKFILE "update") ;CVS
+   (progn  ; CVS
+     (vc-file-clear-masterprops file)
+     (vc-file-setprop file 'vc-workfile-version nil)
+     (vc-file-setprop file 'vc-locking-user nil)
+     (vc-do-command 1 "cvs" file 'WORKFILE "update"))
    ))
 
 (defun vc-check-headers ()