Relax existing-registration check in vc-register (tiny change).

* vc/vc.el (vc-register): Allow registering a file which is already
registered with a different backend.

Fixes: debbugs:10589

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 73a58600ba2311cf8c9456df6d81001754fc43c2..6c96213a71ff026ea3cd2d237f410b995729a2db 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-30  OKAZAKI Tetsurou  <okazaki.tetsurou@gmail.com>  (tiny change)
+
+       * vc/vc.el (vc-register): Allow registering a file which is
+       already registered with a different backend (Bug#10589).
+
 2012-11-29  Jambunathan K  <kjambunathan@gmail.com>
             Stefan Monnier  <monnier@iro.umontreal.ca>
 

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index a909aca5bca98063832a6635722abf3c90f0110e..0224211e6cfa377dbd2bfe4bc47bd18c05ac8268 100644 (file)
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1271,12 +1271,10 @@ first backend that could register the file is used."
     ;; many VCS allow that as well.
     (dolist (fname files)
       (let ((bname (get-file-buffer fname)))
-       (unless fname (setq fname buffer-file-name))
-       (when (vc-backend fname)
-         (if (vc-registered fname)
-             (error "This file is already registered")
-           (unless (y-or-n-p "Previous master file has vanished.  Make a new one? ")
-             (error "Aborted"))))
+       (unless fname
+         (setq fname buffer-file-name))
+       (when (vc-call-backend backend 'registered fname)
+         (error "This file is already registered"))
        ;; Watch out for new buffers of size 0: the corresponding file
        ;; does not exist yet, even though buffer-modified-p is nil.
        (when bname