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

[Jim Hyslop]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

>  ------- original message -------
> Date: Fri, 02 Jun 2006 10:44:55 +0200
> From: Stephanie Seibt <stephanie.seibt@hacon.de>
> To: "Mark D. Baushke" <mdb@gnu.org>
> Cc: info-cvs@gnu.org
> Subject: Re: Major change in conflict handling between 1.12.9 and 1.12.13?

>> Environment: remote server cvs-1.12.9 (Debian-patch, should be equal
>> to cvs-1.12.13)
>> pserver access
>> client cvs-1.12.13 for Windows (downloaded from gnu.org)
> 
>> output of cvs-1.12.13 version is
>> Client: Concurrent Versions System (CVS) 1.12.13 (client)
>> Server: Concurrent Versions System (CVS) 1.12.9 (client/server)

Be aware that the 1.12.13 Windows build had a problem which has been
fixed. The new binaries, 1.12.13a, have not yet been uploaded to
nongnu.org, but you can retrieve them from
ftp://ftp.dreampossible.ca/cvs (Mark [or Derek or Larry, if you're
following this], could you please upload the binaries to savannah?)

I will try to reproduce your scenario later today.

Could you enable the client/server logging and post the log files here
(set the environment variable CVS_CLIENT_LOG - everything will be logged
to $CVS_CLIENT_LOG.in and $CVS_CLIENT_LOG.out). ISTR that CVS will not
print any passwords in the files, but review them just in case before
sending.

- --
Jim Hyslop
Dreampossible: Better software. Simply.     http://www.dreampossible.ca
                 Consulting * Mentoring * Training in
    C/C++ * OOD * SW Development & Practices * Version Management
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (MingW32)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFEgDFsLdDyDwyJw+MRAsCAAKCaUZGxPP9DqFZ46PomSLL0IBu7nACbBaH7
15D01N5Lsq3Pb8/a24DzGPA=
=v0b+
-----END PGP SIGNATURE-----