[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: cvs 1.11.10 fails to detect deletion conflict
From: |
Paul Edwards |
Subject: |
Re: cvs 1.11.10 fails to detect deletion conflict |
Date: |
Sun, 28 Dec 2003 06:45:25 GMT |
Index: update.c
===================================================================
RCS file: /cvs/ccvs/src/update.c,v
retrieving revision 1.225
diff -c -r1.225 update.c
*** update.c 25 Nov 2003 09:45:09 -0000 1.225
--- update.c 28 Dec 2003 06:41:54 -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,