Commit 25b80ac1 authored by Karl Heuer's avatar Karl Heuer
Browse files

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

properties after the merge.
parent bcad4985
...@@ -1897,7 +1897,11 @@ From a program, any arguments are passed to the `rcs2log' script." ...@@ -1897,7 +1897,11 @@ From a program, any arguments are passed to the `rcs2log' script."
file file
(error "vc-backend-merge-news not meaningful for SCCS files") ;SCCS (error "vc-backend-merge-news not meaningful for SCCS files") ;SCCS
(error "vc-backend-merge-news not meaningful for RCS files") ;RCS (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 () (defun vc-check-headers ()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment