From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Abrahams Newsgroups: gmane.emacs.devel Subject: pcl-cvs misbehaving Date: Wed, 25 May 2005 15:01:25 -0400 Message-ID: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1117048288 31357 80.91.229.2 (25 May 2005 19:11:28 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 25 May 2005 19:11:28 +0000 (UTC) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 25 21:11:25 2005 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1Db1HG-0001M7-Ih for ged-emacs-devel@m.gmane.org; Wed, 25 May 2005 21:10:50 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Db1LB-00047o-Hq for ged-emacs-devel@m.gmane.org; Wed, 25 May 2005 15:14:53 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Db1KS-0003uX-Bu for emacs-devel@gnu.org; Wed, 25 May 2005 15:14:08 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Db1KR-0003th-25 for emacs-devel@gnu.org; Wed, 25 May 2005 15:14:07 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Db1KP-0003r6-PB for emacs-devel@gnu.org; Wed, 25 May 2005 15:14:06 -0400 Original-Received: from [80.91.229.2] (helo=ciao.gmane.org) by monty-python.gnu.org with esmtp (TLS-1.0:RSA_AES_128_CBC_SHA:16) (Exim 4.34) id 1Db1Bb-0007ZE-66 for emacs-devel@gnu.org; Wed, 25 May 2005 15:04:59 -0400 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1Db17k-0008T2-B8 for emacs-devel@gnu.org; Wed, 25 May 2005 21:01:00 +0200 Original-Received: from 146-115-127-135.c3-0.smr-ubr2.sbo-smr.ma.cable.rcn.com ([146.115.127.135]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 25 May 2005 21:01:00 +0200 Original-Received: from dave by 146-115-127-135.c3-0.smr-ubr2.sbo-smr.ma.cable.rcn.com with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 25 May 2005 21:01:00 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-To: emacs-devel@gnu.org Original-Lines: 45 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: 146-115-127-135.c3-0.smr-ubr2.sbo-smr.ma.cable.rcn.com User-Agent: Gnus/5.110004 (No Gnus v0.4) Emacs/22.0.50 (windows-nt) Cancel-Lock: sha1:hqyAzH1eZQqaswX/qGEv1J+h4p8= 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:37636 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:37636 Symptom: I see a file labelled "need-merge", so I do `d E' and get: `merge' is not applicable to any of the selected files. So I enter the file's path explicitly and get: Retrieving revision 1.36... Fontifying msvc.jam.1.36<2>... (regexps..........) Retrieving revision 1.36... Done Retrieving revision 1.37... Fontifying msvc.jam.1.37<2>... (regexps..........) Retrieving revision 1.37... Done Fontifying .#msvc.jam.1.36... (regexps..........) Retrieving revision 1.37... Done Mark set ediff-setup: Wrong number of arguments: (lambda (type) "A mode to do basic comment and font-lock functionality for files which are too small to warrant their own mode, but have comment characters, keywords, and the like. To define a generic-mode, use the function `define-generic-mode'. To alter an existing generic-mode, use the `alter-generic-mode-' convenience functions. Some generic modes are defined in generic-extras.el" (interactive (list (generic-read-type))) (generic-mode-with-type (intern type))), 0 Mark set With the following stack trace: generic-mode() ediff-setup(# "c:/DOCUME~1/dave/LOCALS~1/Temp/.#msvc.jam.1.362904VvR" #> "c:/DOCUME~1/dave/LOCALS~1/Temp/ediff2904i5X" #> "c:/DOCUME~1/dave/LOCALS~1/Temp/ediff2904vDe" ((lambda nil (delete-file "c:/DOCUME~1/dave/LOCALS~1/Temp/.#msvc.jam.1.362904VvR") (delete-file "c:/DOCUME~1/dave/LOCALS~1/Temp/ediff2904i5X") (if ... ...)) ediff-merge-on-startup cvs-ediff-startup-hook) ((ediff-job-name . ediff-merge-revisions-with-ancestor)) "tools/build/v2/tools/msvc.jam") ediff-buffers-internal(# #> #> (ediff-merge-on-startup cvs-ediff-startup-hook) ediff-merge-revisions-with-ancestor "tools/build/v2/tools/msvc.jam") ediff-merge-buffers-with-ancestor(# #> #> (cvs-ediff-startup-hook) ediff-merge-revisions-with-ancestor "tools/build/v2/tools/msvc.jam") cvs-ediff-merge(# #> #> "tools/build/v2/tools/msvc.jam") #[nil "\306\304\307\310\311\312\311&^F\211^X\313H >\204^V Anyone have a clue for me? Thanks! -- Dave Abrahams Boost Consulting www.boost-consulting.com