Major change in conflict handling between 1.12.9 and 1.12.13?

[Steve McIntyre]

Hi,

I've updated from 1.12.9 to 1.12.13 and I'm seeing a *really* major
change in behaviour when conflicts happen; a merge conflict is only
reported during the merge itself. The conflict marker itself is then
lost on subsequent calls to update.

Using 1.12.9:
-------------
tack:/tmp/seyon$ cvs-1.12.9 -q up
RCS file: /home/cvs/seyon/Seyon.c,v
retrieving revision 1.28
retrieving revision 1.29
Merging differences between 1.28 and 1.29 into Seyon.c
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in Seyon.c
C Seyon.c
tack:/tmp/seyon$ cvs-1.12.9 -q up
C Seyon.c

Using 1.12.13:
--------------
tack:/tmp/seyon$ cvs-1.12.13 -q up
RCS file: /home/cvs/seyon/Seyon.c,v
retrieving revision 1.29
retrieving revision 1.30
Merging differences between 1.29 and 1.30 into Seyon.c
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in Seyon.c
C Seyon.c
tack:/tmp/seyon$ cvs-1.12.13 -q up
tack:/tmp/seyon$ 

If I look at this file now, it has conflict markers but does not show
up as either Conflicting or Modified. And status shows it as
up-to-date:

tack:/tmp/seyon$ cvs-1.12.13 status Seyon.c
===================================================================
File: Seyon.c           Status: Up-to-date

   Working revision:    1.30
   Repository revision: 1.30    /home/cvs/seyon/Seyon.c,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

I can't believe this change was deliberate; it's rather worrying, and
it breaks normal workflow - I've had several user complaints
already. Should I raise a bug?

-- 
Steve McIntyre, Cambridge, UK.                                address@hidden
Support the Campaign for Audiovisual Free Expression: http://www.eff.org/cafe/

signature.asc
Description: Digital signature