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

--===============0996651852==
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="P7Tqkd/m/Jnohiaz"
Content-Disposition: inline


--P7Tqkd/m/Jnohiaz
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Jun 08, 2006 at 12:05:03AM -0400, Jim Hyslop wrote:
>-----BEGIN PGP SIGNED MESSAGE-----
>Hash: SHA1
>
>Jim Hyslop wrote:
>> Steve McIntyre wrote:
>>=20
>>>>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.
>>=20
>>=20
>> Hmmm... you're using ssh, others have reported problems with pserver.
>> Just a sec...
>>=20
>> Bingo - I can reproduce the problem using pserver. It seems to be a
>> problem only with remote repositories. Now that I can reproduce it, I
>> should be able to track it down.
>
>OK, I've tracked it down to client.c, in send_fileproc. 1.11.20 (which
>works properly) has this code to test if the file has been modified:
>
>    else if (vers->ts_rcs =3D=3D NULL
>	     || args->force
>	     || strcmp (vers->ts_user, vers->ts_rcs) !=3D 0)
>
>
>and 1.11.21 has changed the test to this:
>
>    else if (vers->ts_rcs =3D=3D NULL
>	     || args->force
>	     || strcmp (vers->ts_conflict
>		        ? vers->ts_conflict : vers->ts_rcs, vers->ts_user)
>	     || (vers->ts_conflict && !strcmp (cvs_cmd_name, "diff")))
>    {
>
>This change was introduced in rev 1.318.4.29, and the log entry says:
>* client.c (send_fileproc): Don't send contents for files known to have
>conflicts unless this is for `cvs diff'.
>
>Problem is, with the "Update" command, if it's not modified and it's not
>conflicting, it must be up-to-date.
>
>That's the only change for 1.318.4.29 (tagged revision for 1.11.21), so
>I would suggest we back that change out.

Just to confirm - this fixes my problem. Thanks for the quick work, Jim!

--=20
Steve McIntyre, Cambridge, UK.                                steve@einval.=
com
"It's actually quite entertaining to watch ag129 prop his foot up on
 the desk so he can get a better aim."          [ seen in ucam.chat ]

--P7Tqkd/m/Jnohiaz
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQFEiubZfDt5cIjHwfcRAiWmAKCt/oHQLGg5/TgC+b50dsqk2g5j4wCgjX+h
MZYqOHbtHPApq1b3iqj/5Ww=
=a4lo
-----END PGP SIGNATURE-----

--P7Tqkd/m/Jnohiaz--




--===============0996651852==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
info-cvs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/info-cvs

--===============0996651852==--