pcl-cvs: merging in wrong revision file when conflicts

[Dominique de Waleffe]

Hi,

We are using pcl-cvs on a large project and we have been observing
strange behaviour when calling the function bound to  "d E"
(interactive merge). At first I believed this behaviour was a server
bug.

However, today it happened again and upon closer inspection, I think
the behaviour is attributable to pcl-cvs (or some other function
called by it).

The symptom is that CVS reports a conflict upon update, we do d E on
the file and the marge happens between an older revision (say 1.7, for
teh example) (that also led to conflicts) and the locally modified
file instead of the real conflicting version (1.23) and the locally modified
one.

Upon inspection of the directory, I noticed that I had 
.#f.1.20
.#f.1.23
.#f.1.5
.#f.1.6
.#f.1.7

in my directory. The merge used .#f.1.7 instead of .#f.1.23.
I removed .#f.7 and then tried again. The merge used .#f.1.6 
I then removed .#f.1.{5,6} and tried again, now it used .#f.1.23 the
expected version.

I have a strong suspicion that there is a sort done on the names to
find the most recent conflicting revision and that this sort is done
incorrectly on strings instead of on numerical revision numbers.

An earlier case was on a file where the merge should have been done on
rev 123
but was  done on rev 91, where indeed, ther was  .#x.1.123 and .#x.1.91 in
my directory. However the pattern only appeared clearly today to me.

I do not know where to start for finding this so I report this as a
problem. 

Best regards,

D. de Waleffe

In GNU Emacs 21.3.50.1 (i386-mingw-nt5.0.2195)
 of 2005-01-30 on NONIQPC
Distributor `Microsoft Corp.', version 5.0.2195
configured using `configure --with-gcc (3.3) --cflags -I../../jpeg-6b-3/include 
-I../../libpng-1.2.8/include -I../../tiff-3.6.1-2/include 
-I../../xpm-nox-4.2.0/include -I../../zlib-1.2.2/include'

Important settings:
  value of $LC_ALL: nil
  value of $LC_COLLATE: nil
  value of $LC_CTYPE: nil
  value of $LC_MESSAGES: nil
  value of $LC_MONETARY: nil
  value of $LC_NUMERIC: nil
  value of $LC_TIME: nil
  value of $LANG: FRB
  locale-coding-system: cp1252
  default-enable-multibyte-characters: nil

Major mode: Emacs-Lisp

Minor modes in effect:
  auto-compression-mode: t
  show-paren-mode: t
  msb-mode: t
  display-time-mode: t
  tool-bar-mode: t
  encoded-kbd-mode: t
  mouse-wheel-mode: t
  menu-bar-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  unify-8859-on-encoding-mode: t
  utf-translate-cjk-mode: t
  line-number-mode: t
  transient-mark-mode: t

Recent input:
<mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> 
<mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> 
<mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> 
<mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> 
<mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> 
<mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> 
<mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> 
<mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> 
<mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> 
<mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> 
<mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> 
<mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> 
<mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> 
<mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> 
<help-echo> <down-mouse-1> <mouse-movement> <mouse-movement> 
<drag-mouse-1> M-w <help-echo> <help-echo> <help-echo> 
<help-echo> <help-echo> <help-echo> <help-echo> <menu-bar> 
<help-menu> <report-emacs-bug>

Recent messages:
Loading texnfo-upd...done
Loading places from ~/.emacs-places...
Loading places from c:/users/ddw/.emacs-places...done
Loading jit-lock...done
Making completion list... [2 times]
Loading cl-macs...done
Type C-x 1 to remove help window.  C-M-v to scroll the help.
Loading vc-cvs...done
Mark saved where search started [2 times]
Loading emacsbug...done