Re: Stable CVS Version 1.11.13 Released!

[Paul Edwards]

"Mark D. Baushke" <mdb@cvshome.org> wrote in message 
news:mailman.2420.1076841826.928.bug-cvs@gnu.org...
> > Looks like the mailing list to newsgroup is working
> > again.  I wonder if it is still bidirectional?
>
> I have no idea. I suppose it will depend on where the
> newsgroup gets its feed.

If you received this via bug-cvs, then it means it is
bidirectional.  I only read/post via the newsgroup.

> > I submitted this fix before, but I don't think it ever made
> > it to your end.  I'm resubmitting against current version...
>
> The patch you submitted had whitespace problems. When I

I don't know what causes the whitespace problems.  I am just
using explorer, opening in notepad, then cut & paste into
outlook express.  I've switched to unidiff in case that helps.

I wish people didn't hold on so dear to tabs (in source
code), they're a real pain.

> manually apply it to the TRUNK sources I see that it almost
> immediately (sanity.sh test 95) triggers an assertion
> failure in the RCS_checkout() function on line 3972:
>
>     assert (rev == NULL || isdigit ((unsigned char) *rev));
>
> with rev being garbage rather than NULL. This may be directly
> traced to the fact that join_rev2 is NULL, but rev2 is not NULL
> and contains garbage.

I can see it is being freed early.  I have a new patch, with
that stuff moved down.

> If/when you have another version of the patch, feel free to
> let us know. It would also be highly desirable for you to
> include a suggested ChangeLog entry for the change and (if

Index: ChangeLog
===================================================================
RCS file: /cvs/ccvs/src/ChangeLog,v
retrieving revision 1.2690
diff -u -r1.2690 ChangeLog
--- ChangeLog 13 Feb 2004 19:59:01 -0000 1.2690
+++ ChangeLog 15 Feb 2004 11:47:22 -0000
@@ -1,3 +1,7 @@
+2004-02-15  Paul Edwards  <kerravon@w3.to>
+
+ * update.c (join_file): Detect deletion conflicts.
+
 2004-02-13  Derek Price  <derek@ximbiot.com>

  * lock.c (Reader_Lock, lock_dir_for_write): Plug memory leaks.
@@ -650,7 +654,7 @@
 2003-11-01  Larry Jones  <lawrence.jones@eds.com>

  * filesubr.c (xcmp): Make sure S_ISLNK exists before calling it.
- (Reported by Paul Edwards <kerravon@nosppaam.w3.to>.)
+ (Reported by Paul Edwards <kerravon@w3.to>.)

 2003-10-31  Derek Price  <derek@ximbiot.com>


> possible) either a patch to sanity.sh to test the new
> functionality, or a step-by-step description of how to test
> it by hand that one of us could form into a new sanity.sh
> test.

Here are the two flavours.  Only the first demonstrates the
problem.  The second is to make sure the fix didn't
introduce a bug.

http://www.google.com.au/groups?hl=en&lr=&ie=UTF-8&oe=UTF-8&selm=n%25uHb.67589%24aT.8689%40news-server.bigpond.net.au

http://www.google.com.au/groups?hl=en&lr=&ie=UTF-8&oe=UTF-8&selm=C0vHb.67591%24aT.3831%40news-server.bigpond.net.au


Index: update.c
===================================================================
RCS file: /cvs/ccvs/src/update.c,v
retrieving revision 1.226
diff -u -r1.226 update.c
--- update.c 2 Feb 2004 21:10:28 -0000 1.226
+++ update.c 15 Feb 2004 11:40:35 -0000
@@ -2129,9 +2129,6 @@
     {
  char *mrev;

- if (rev2 != NULL)
-     free (rev2);
-
  /* If the first revision doesn't exist either, then there is
            no change between the two revisions, so we don't do
            anything.  */
@@ -2180,6 +2177,9 @@
  {
      if (rev1 != NULL)
   free (rev1);
+     if (rev2 != NULL)
+         free (rev2);
+
      return;
  }

@@ -2206,16 +2206,23 @@

      if (rev1 != NULL)
   free (rev1);
+     if (rev2 != NULL)
+         free (rev2);

      return;
  }

- /* If only one join tag was specified, and the user file has
-           been changed since the greatest common ancestor (rev1),
+ /* If the file has been changed, genuinely changed,
+           in comparison to the greatest common ancestor (rev1),
            then there is a conflict we can not resolve.  See above for
            the rationale.  */
- if (join_rev2 == NULL
-     && strcmp (rev1, vers->vn_user) != 0)
+        if ((strcmp (rev1, vers->vn_user) != 0)
+            && RCS_cmp_file(vers->srcfile,
+                            rev1,
+                            (char **)NULL,
+                            rev2,
+                            vers->options,
+                            finfo->file))
  {
      if (jdate2 != NULL)
   error (0, 0,
@@ -2231,12 +2238,16 @@

      if (rev1 != NULL)
   free (rev1);
+     if (rev2 != NULL)
+         free (rev2);

      return;
  }

  if (rev1 != NULL)
      free (rev1);
+ if (rev2 != NULL)
+     free (rev2);

  /* The user file exists and has not been modified.  Mark it
            for removal.  FIXME: If we are doing a checkout, this has