[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Ediff-patch-file with wrong default buffer

From: Juri Linkov
Subject: Re: Ediff-patch-file with wrong default buffer
Date: Tue, 02 Feb 2010 02:31:50 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.92 (x86_64-pc-linux-gnu)

There is another problem with ediff-patch-file and bzr.

Applying a patch to a bzr tree using ediff-patch-file
asks a question:

  File is under version control.  Check it out? (y or n)

that makes no sense.

Maybe "Bzr" should be added to a list of backends
in `ediff-file-checked-in-p'?

=== modified file 'lisp/ediff-util.el'
--- lisp/ediff-util.el  2010-01-13 08:35:10 +0000
+++ lisp/ediff-util.el  2010-02-02 00:29:43 +0000
@@ -1127,7 +1127,7 @@ (defun ediff-file-checked-out-p (file)
 (defun ediff-file-checked-in-p (file)
   (and (featurep 'vc-hooks)
        ;; CVS files are considered not checked in
-       (not (memq (vc-backend file) '(nil CVS)))
+       (not (memq (vc-backend file) '(nil CVS Bzr)))
        (if (fboundp 'vc-state)
            (not (memq (vc-state file) '(edited needs-merge)))

Juri Linkov

reply via email to

[Prev in Thread] Current Thread [Next in Thread]