Problem with cvs-update on lisp/emacs-lisp/cl-loaddefs.el

[Peter Dyballa-2]

Hello!

Since some weeks I can see in *cvs* buffer:

        In directory lisp/emacs-lisp:
        Message: cvs update: nonmergeable file needs merge
        Message: cvs update: revision 1.6 from repository is now in lisp/
emacs-lisp/cl-loaddefs.el
        Message: cvs update: file from working directory is now in .#cl-
loaddefs.el.1.5
                      Conflict                lisp/emacs-lisp/cl-loaddefs.el

When I check with diff or ls I get no difference:

        pete 116 /\ diff lisp/emacs-lisp/cl-loaddefs.el lisp/emacs-lisp/.#cl-
loaddefs.el.1.5
        pete 117 /\ ls -l lisp/emacs-lisp/cl-loaddefs.el lisp/emacs-
lisp/.#cl-loaddefs.el.1.5
        -rw-r--r--   1 pete  admin  41962  4 Aug 13:41 lisp/emacs-lisp/.#cl-
loaddefs.el.1.5
        -rw-r--r--   1 pete  admin  41962 11 Aug 17:26 lisp/emacs-lisp/cl-
loaddefs.el

In GNU Emacs 22.1.50.2 (powerpc-apple-darwin8.10.0, X toolkit, Xaw3d  
scroll bars)
  of 2007-08-04 on localhost
Windowing system distributor `The XFree86 Project, Inc', version  
11.0.40400000
configured using `configure  '--without-carbon' '--with-x' '--without-
sound' '--without-pop' '--with-xpm' '--with-jpeg' '--with-tiff' '--
with-gif' '--with-png' '--with-x-toolkit=athena' '--enable-
locallisppath=/Library/Application Support/Emacs/calendar22:/Library/
Application Support/Emacs/caml:/Library/Application Support/Emacs:/sw/
share/emacs21/site-lisp/elib' 'CFLAGS=-pipe -dead_strip -bind_at_load  
-fPIC -mcpu=7450 -mtune=7450 -fast -mpim-altivec -ftree-vectorize -
foptimize-register-move -freorder-blocks -freorder-blocks-and-
partition -fthread-jumps -fpeephole -fno-crossjumping' 'CPPFLAGS=-no-
cpp-precomp -I/usr/include/openssl -I/sw/include/pango-1.0 -I/sw/lib/
freetype219/include -I/sw/lib/freetype219/include/freetype2 -I/sw/lib/
fontconfig2/include -I/sw/include/libpng12 -I/usr/local/include -I/sw/
include -idirafter /usr/X11R6/include' 'LDFLAGS=-dead_strip -
bind_at_load -multiply_defined suppress -L/sw/lib/freetype219/lib -L/
sw/lib/fontconfig2/lib -L/sw/lib/ncurses -L/usr/local/lib -L/sw/lib -
L/usr/local/lib''

Important settings:
   value of $LC_ALL: nil
   value of $LC_COLLATE: nil
   value of $LC_CTYPE: de_DE.UTF-8
   value of $LC_MESSAGES: nil
   value of $LC_MONETARY: nil
   value of $LC_NUMERIC: nil
   value of $LC_TIME: nil
   value of $LANG: de_DE.UTF-8
   locale-coding-system: utf-8
   default-enable-multibyte-characters: t

Major mode: Debugger

Minor modes in effect:
   show-paren-mode: t
   display-time-mode: t
   tooltip-mode: t
   mouse-wheel-mode: t
   menu-bar-mode: t
   file-name-shadow-mode: t
   global-font-lock-mode: t
   font-lock-mode: t
   blink-cursor-mode: t
   unify-8859-on-encoding-mode: t
   utf-translate-cjk-mode: t
   auto-compression-mode: t
   line-number-mode: t
   transient-mark-mode: t


--
Greetings

   Pete

The box said "Use Windows 95 or better," so I got a Macintosh.




_______________________________________________
emacs-pretest-bug mailing list
emacs-pretest-bug@...
http://lists.gnu.org/mailman/listinfo/emacs-pretest-bug