Re: Major change in conflict handling between 1.12.9 and 1.12.13?

[Steve McIntyre]

On Thu, Jun 01, 2006 at 11:29:00PM -0400, Jim Hyslop wrote:
>-----BEGIN PGP SIGNED MESSAGE-----
>Hash: SHA1
>
>Mark D. Baushke wrote:
>> Hi Steve,
>> 
>> I added the following patch to the cvs-1.12.13/src/sanity.sh to try to
>> test your problem. I am still unable to reproduce your error.
>
>I tried it as well, and can't reproduce it. A similar issue was also
>recently reported in the stable branch (see
>http://lists.gnu.org/archive/html/bug-cvs/2006-05/msg00048.html) I'm
>wondering if there's a configuration issue somewhere?
>
>Steve, can you please provide details about your environment (platform;
>local or remote repository; if remote, what version of the server is it
>and connection method; any other details which you may feel are
>relevant)? Did you build the binaries from source, or download a binary
>from somewhere?

I'm running these tests on an i386 Linux machine running Debian sarge,
using binaries I've configured and compiled directly from the standard
upstream tarballs for 1.12.9 and 1.12.13. I am in fact the Debian
maintainer for cvs, which is why I started digging into this. My
original tests were using cvs 1.12.13 built with the small number of
patches that we apply for the Debian build, but I've since reproduced
my issue using completely vanilla builds with no patches applied.

All my tests have been against another i386 Debian machine running
sarge and the standard Debian package of cvs, version 1.12.9. I'm
using ssh as a transport.

>Also, can you try reproducing the problem using just 1.12.13 on a
>brand-new file in a clean working directory? I'm wondering if 1.12.9
>leaves some cruft in the CVS/ directory that confuses 1.12.13.

OK, I'll try that now. <pause> Same problem:

tack:/tmp$ cvs-1.12.13 up seyon1 
cvs update: Updating seyon1
RCS file: /home/cvs/seyon/Seyon.c,v
retrieving revision 1.35
retrieving revision 1.36
Merging differences between 1.35 and 1.36 into Seyon.c
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in seyon1/Seyon.c
C seyon1/Seyon.c
tack:/tmp$ cvs-1.12.13 up seyon1
cvs update: Updating seyon1
tack:/tmp$ cvs-1.12.13 up seyon1
cvs update: Updating seyon1
tack:/tmp$

-- 
Steve McIntyre, Cambridge, UK.                                address@hidden
"This dress doesn't reverse." -- Alden Spiess