bug-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Stable CVS Version 1.11.13 Released!


From: Paul Edwards
Subject: Re: Stable CVS Version 1.11.13 Released!
Date: Sun, 15 Feb 2004 01:52:00 GMT

Looks like the mailing list to newsgroup is working
again.  I wonder if it is still bidirectional?

I submitted this fix before, but I don't think it ever made
it to your end.  I'm resubmitting against current version...

Index: update.c
===================================================================
RCS file: /cvs/ccvs/src/update.c,v
retrieving revision 1.226
diff -c -r1.226 update.c
*** update.c 2 Feb 2004 21:10:28 -0000 1.226
--- update.c 15 Feb 2004 01:48:13 -0000
***************
*** 2210,2221 ****
       return;
   }

!  /* If only one join tag was specified, and the user file has
!            been changed since 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 (jdate2 != NULL)
    error (0, 0,
--- 2210,2226 ----
       return;
   }

!  /* 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 ((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,




reply via email to

[Prev in Thread] Current Thread [Next in Thread]