pcl-cvs misbehaving

[David Abrahams <dave@boost-consulting.com>]

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(#<buffer .#msvc.jam.1.36> "c:/DOCUME~1/dave/LOCALS~1/Temp/.#msvc.jam.1.362904VvR" #<buffer msvc.jam.1.37<3>> "c:/DOCUME~1/dave/LOCALS~1/Temp/ediff2904i5X" #<buffer msvc.jam.1.36<3>> "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(#<buffer .#msvc.jam.1.36> #<buffer msvc.jam.1.37<3>> #<buffer msvc.jam.1.36<3>> (ediff-merge-on-startup cvs-ediff-startup-hook) ediff-merge-revisions-with-ancestor "tools/build/v2/tools/msvc.jam")
  ediff-merge-buffers-with-ancestor(#<buffer .#msvc.jam.1.36> #<buffer msvc.jam.1.37<3>> #<buffer msvc.jam.1.36<3>> (cvs-ediff-startup-hook) ediff-merge-revisions-with-ancestor "tools/build/v2/tools/msvc.jam")
  cvs-ediff-merge(#<buffer .#msvc.jam.1.36> #<buffer msvc.jam.1.37<3>> #<buffer msvc.jam.1.36<3>> "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