From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Ediff-patch-file with wrong default buffer Date: Mon, 01 Feb 2010 21:34:35 -0500 Message-ID: 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> <87636gebsp.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 1265078093 27324 80.91.229.12 (2 Feb 2010 02:34:53 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 2 Feb 2010 02:34:53 +0000 (UTC) Cc: kifer@cs.sunysb.edu, emacs-devel@gnu.org To: Juri Linkov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Feb 02 03:34:50 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 1Nc8bH-0002lu-KT for ged-emacs-devel@m.gmane.org; Tue, 02 Feb 2010 03:34:47 +0100 Original-Received: from localhost ([127.0.0.1]:41491 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nc8bH-0005kV-18 for ged-emacs-devel@m.gmane.org; Mon, 01 Feb 2010 21:34:47 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nc8bD-0005kL-74 for emacs-devel@gnu.org; Mon, 01 Feb 2010 21:34:43 -0500 Original-Received: from [199.232.76.173] (port=33261 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nc8bC-0005k8-Ur for emacs-devel@gnu.org; Mon, 01 Feb 2010 21:34:42 -0500 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nc8bB-0003sj-0z for emacs-devel@gnu.org; Mon, 01 Feb 2010 21:34:42 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:57027 helo=ironport2-out.pppoe.ca) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nc8bA-0003sR-NJ for emacs-devel@gnu.org; Mon, 01 Feb 2010 21:34:40 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AsQEAOcdZ0tFpaN9/2dsb2JhbACBM9g8hEUEilo X-IronPort-AV: E=Sophos;i="4.49,386,1262581200"; d="scan'208";a="55122292" Original-Received: from 69-165-163-125.dsl.teksavvy.com (HELO ceviche.home) ([69.165.163.125]) by ironport2-out.pppoe.ca with ESMTP; 01 Feb 2010 21:34:37 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id 681EAB461F; Mon, 1 Feb 2010 21:34:35 -0500 (EST) In-Reply-To: <87636gebsp.fsf@mail.jurta.org> (Juri Linkov's message of "Tue, 02 Feb 2010 02:31:50 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. 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:120809 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))) Isn't that backwards? Shouldn't (not (memq (vc-backend file) '(nil CVS))) be replaced by (memq (vc-backend file) '(RCS SCCS))? Stefan