From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.devel Subject: Re: Ediff-patch-file with wrong default buffer Date: Tue, 02 Feb 2010 02:31:50 +0200 Organization: JURTA Message-ID: <87636gebsp.fsf@mail.jurta.org> References: <874oo5nfsl.fsf@lola.goethe.zz> <87ljhey8gx.fsf@mail.jurta.org> <874oo2jzq2.fsf@lola.goethe.zz> <87aaxnjfkg.fsf@lola.goethe.zz> <87pr6iskww.fsf@mail.jurta.org> <87eimytcl1.fsf@stupidchicken.com> <87ocm2p1vf.fsf_-_@mail.jurta.org> <20091214004325.61e9afe3@kiferserv> <87ocm2m6v3.fsf@mail.jurta.org> <20091214011540.583ab64a@kiferserv> <87aaxmkput.fsf@mail.jurta.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1265072101 10828 80.91.229.12 (2 Feb 2010 00:55:01 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 2 Feb 2010 00:55:01 +0000 (UTC) Cc: emacs-devel@gnu.org To: kifer@cs.sunysb.edu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Feb 02 01:54:58 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Nc72e-0002GP-LS for ged-emacs-devel@m.gmane.org; Tue, 02 Feb 2010 01:54:56 +0100 Original-Received: from localhost ([127.0.0.1]:44103 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nc72d-0000Lt-MX for ged-emacs-devel@m.gmane.org; Mon, 01 Feb 2010 19:54:55 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nc72Y-0000L0-Ck for emacs-devel@gnu.org; Mon, 01 Feb 2010 19:54:50 -0500 Original-Received: from [199.232.76.173] (port=38304 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nc72Y-0000Kf-1n for emacs-devel@gnu.org; Mon, 01 Feb 2010 19:54:50 -0500 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nc72V-00009w-Gr for emacs-devel@gnu.org; Mon, 01 Feb 2010 19:54:49 -0500 Original-Received: from smtp-out4.starman.ee ([85.253.0.6]:60376 helo=mx2.starman.ee) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nc72U-00009n-Uz for emacs-devel@gnu.org; Mon, 01 Feb 2010 19:54:47 -0500 X-Virus-Scanned: by Amavisd-New at mx2.starman.ee Original-Received: from mail.starman.ee (82.131.53.239.cable.starman.ee [82.131.53.239]) by mx2.starman.ee (Postfix) with ESMTP id 0D0F43F40A4; Tue, 2 Feb 2010 02:54:39 +0200 (EET) In-Reply-To: <87aaxmkput.fsf@mail.jurta.org> (Juri Linkov's message of "Mon, 14 Dec 2009 08:54:18 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.92 (x86_64-pc-linux-gnu) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:120804 Archived-At: 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) (and (not (memq (vc-state file) '(edited needs-merge))) -- Juri Linkov http://www.jurta.org/emacs/