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

[Jim Hyslop]

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

[Note: restoring this discussion to bug-cvs list - Derek's patch is
copied below my sig]

Derek R. Price wrote:
>  I'd like to look into
> this a little deeper because this change was supposed to fix another
> issue.  I'm guessing that it was only the new client running against
> an old server that exhibited the problem?  If so, then does the
> attached patch fix this problem?

Applying the patch to 1.11.21, and using an old server, the patch
resolves the issue. I can't test against a new server, though.

Given the serious nature of this bug, what do you think about releasing
revs 1.11.22 and 1.12.14? If there are outstanding items in progress, we
can branch off 1.11.21 and 1.12.13 and have the release address only
this issue.

- --
Jim Hyslop
Dreampossible: Better software. Simply.     http://www.dreampossible.ca
                 Consulting * Mentoring * Training in
    C/C++ * OOD * SW Development & Practices * Version Management

? check.log
? check.plog
? serve-empty-conflicts.diff
Index: src/client.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/client.c,v
retrieving revision 1.318.4.41
diff -u -p -r1.318.4.41 client.c
- --- src/client.c      31 May 2006 15:15:56 -0000      1.318.4.41
+++ src/client.c        8 Jun 2006 15:10:41 -0000
@@ -5148,6 +5148,7 @@ warning: ignoring -k options due to serv
     else if (vers->ts_rcs == NULL
             || args->force
             || strcmp (vers->ts_conflict
+                       && supported_request ("Empty-conflicts")
                        ? vers->ts_conflict : vers->ts_rcs, vers->ts_user)
             || (vers->ts_conflict && !strcmp (cvs_cmd_name, "diff")))
     {
Index: src/server.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/server.c,v
retrieving revision 1.284.2.50
diff -u -p -r1.284.2.50 server.c
- --- src/server.c      26 May 2006 16:25:25 -0000      1.284.2.50
+++ src/server.c        8 Jun 2006 15:10:42 -0000
@@ -4863,6 +4863,7 @@ struct request requests[] =
   REQ_LINE("Checkin-time", serve_checkin_time, 0),
   REQ_LINE("Modified", serve_modified, RQ_ESSENTIAL),
   REQ_LINE("Is-modified", serve_is_modified, 0),
+  REQ_LINE("Empty-conflicts", serve_noop, 0),

   /* The client must send this request to interoperate with CVS 1.5
      through 1.9 servers.  The server must support it (although it can
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (MingW32)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFEiMA9LdDyDwyJw+MRAtJSAKCJSo/asCprh3JvsuLsVzjUkCAT8wCgrsAb
GUxNXfyhbm8cvAwaf8BJElw=
=Zisy
-----END PGP SIGNATURE-----