Re: CVS hosed? tests/automated/base64-tests.el is gone!

Gunnar> After Martin´s fix for the Fmapconcat crashes I wanted to reenable the Gunnar> test in base64-tests.el which Hrvoje had disabled some time ago, but Gunnar> something is broken with the repository.I think I have had this Gunnar> problem before... Gunnar> a cvs stat in tests/automated gives: Gunnar> cvs server: conflict: base64-tests.el is modified but no longer in the repository Gunnar> =================================================================== Gunnar> File: base64-tests.el Status: Unresolved Conflict Gunnar> Working revision: 1.1.2.3 Gunnar> Repository revision: No revision control file Gunnar> Sticky Tag: release-21-2 - MISSING from RCS file! Gunnar> Sticky Date: (none) Gunnar> Sticky Options: (none) Gunnar> and looking at the cvsweb thingie at cvs.xemacs.org the file indeed Gunnar> seems to be missing! All the other tests are in the Attic (presumably Gunnar> because they are not in the HEAD (21.1) release). Can anybody with a Gunnar> real account on the machine check? The actual respository looks like this: (martinb＠camelot-soft) /usr/CVSroot/XEmacs/xemacs/tests/automated $ ls -lR total 1 drwxrwxr-x 2 steveb xemacs 512 Dec 18 00:05 Attic ./Attic: total 108 -r--r--r-- 1 martinb xemacs 1768 Dec 14 15:22 README,v -r--r--r-- 1 steveb xemacs 14525 Jun 11 1999 base64-tests.el,v-SAVE -r--r--r-- 1 martinb xemacs 4847 Dec 14 15:22 byte-compiler-tests.el,v -r--r--r-- 1 martinb xemacs 4028 Dec 14 15:22 database-tests.el,v -r--r--r-- 1 martinb xemacs 13003 Dec 14 15:22 hash-table-tests.el,v -r--r--r-- 1 martinb xemacs 33350 Dec 18 00:05 lisp-tests.el,v -r--r--r-- 1 martinb xemacs 4470 Dec 14 15:22 md5-tests.el,v -r--r--r-- 1 martinb xemacs 3526 Dec 14 15:22 mule-tests.el,v -r--r--r-- 1 martinb xemacs 11818 Dec 14 15:22 symbol-tests.el,v -r--r--r-- 1 martinb xemacs 15149 Dec 14 15:22 test-harness.el,v I think the files are all in the `Attic' since none of these files are present in 21.1.8, i.e. the CVS HEAD. It seems that base64-tests.el,v-SAVE has been simply renamed in the repository, which seems to be a no-no. I propose we do # In repository cd tests/automated/Attic; mv base64-tests.el,v-SAVE base64-tests.el,v # In workspace cd tests/automated; cvs update And see what happens. If no one has no objections, I will do this soon. If we want to keep this file in the removed state in 21.2, we should use proper CVS commands to do so. Martin