diff options
| author | Karl Heuer <kwzh@gnu.org> | 1995-07-17 23:04:30 +0000 |
|---|---|---|
| committer | Karl Heuer <kwzh@gnu.org> | 1995-07-17 23:04:30 +0000 |
| commit | 25b80ac1466326706a8570d70aaa6c9e2b4b6038 (patch) | |
| tree | 7624c7be994518cbaf48bdb5cc6409e325817bd7 /lisp | |
| parent | bcad498517424aae31e52e6cbda4f7ac553eb503 (diff) | |
| download | emacs-25b80ac1466326706a8570d70aaa6c9e2b4b6038.tar.gz | |
(vc-backend-merge-news): Force to refetch the
properties after the merge.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/vc.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index cc27216dd69..80318b8c93d 100644 --- 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 () |