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

[Steve McIntyre]

On Thu, Jun 01, 2006 at 12:38:12PM -0700, Mark D. Baushke wrote:
>-----BEGIN PGP SIGNED MESSAGE-----
>Hash: SHA1
>
>Could you provide a recipe for how to reproduce this problem exactly?
>
>I tried a few simple things without finding the problem you describe.

Well, my original mail described the problem I thought.

Checkout the same source tree into two sandboxes. Then edit one file
in both, making incompatible changes (e.g. append a different line to
each) on the same line of that file. Check one of them in, then run
cvs update on the other and look for the conflict and how it's
retained (or not).

tack:/tmp$ echo "wibble" >>seyon/Seyon.c
tack:/tmp$ echo "wibble1" >>seyon1/Seyon.c
tack:/tmp$ cvs-1.12.9 -q ci -m "1.12.9 test" seyon/Seyon.c
/home/cvs/seyon/Seyon.c,v  <--  seyon/Seyon.c
new revision: 1.31; previous revision: 1.30
tack:/tmp$ cd seyon1/
tack:/tmp/seyon1$ cvs-1.12.9 -q up
RCS file: /home/cvs/seyon/Seyon.c,v
retrieving revision 1.30
retrieving revision 1.31
Merging differences between 1.30 and 1.31 into Seyon.c
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in Seyon.c
C Seyon.c
tack:/tmp/seyon1$ cvs-1.12.9 -q up
C Seyon.c

<clean up, regenerate test trees>

tack:/tmp$ echo "wibble" >>seyon/Seyon.c
tack:/tmp$ echo "wibble1" >>seyon1/Seyon.c
tack:/tmp$ cvs-1.12.13 -q ci -m "1.12.13 test" seyon/Seyon.c
/home/cvs/seyon/Seyon.c,v  <--  seyon/Seyon.c
new revision: 1.32; previous revision: 1.31
tack:/tmp$ cd seyon1/
tack:/tmp/seyon1$ cvs-1.12.13 -q up
RCS file: /home/cvs/seyon/Seyon.c,v
retrieving revision 1.31
retrieving revision 1.32
Merging differences between 1.31 and 1.32 into Seyon.c
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in Seyon.c
C Seyon.c
tack:/tmp/seyon1$ cvs-1.12.13 -q up
tack:/tmp/seyon1$

I hope that's reproducible for you too!

-- 
Steve McIntyre, Cambridge, UK.                                address@hidden
"I suspect most samba developers are already technically insane... Of
 course, since many of them are Australians, you can't tell." -- Linus Torvalds

signature.asc
Description: Digital signature