On Fri, Jun 02, 2006 at 12:40:00AM -0700, Mark D. Baushke wrote: >-----BEGIN PGP SIGNED MESSAGE----- >Hash: SHA1 > >Are you able to give us a step-by-step reproducable test case? > >If you look in the CVS/Entries file does the entry for your conflicted >file have something that looks like this line: > >/filename/1.30/Result of merge+Fri Jun 2 07:40:30 2006// > >before and after the final 'cvs update' ?
Doing similar here, I get tack:/tmp$ grep /Seyon.c/ seyon1/CVS/Entries /Seyon.c/1.36/Wed Jun 7 23:44:30 2006// tack:/tmp$ cvs-1.12.13 -q up seyon1 RCS file: /home/cvs/seyon/Seyon.c,v retrieving revision 1.36 retrieving revision 1.37 Merging differences between 1.36 and 1.37 into Seyon.c rcsmerge: warning: conflicts during merge cvs update: conflicts found in seyon1/Seyon.c C seyon1/Seyon.c tack:/tmp$ grep /Seyon.c/ seyon1/CVS/Entries /Seyon.c/1.37/Result of merge+Wed Jun 7 23:50:00 2006// tack:/tmp$ cvs-1.12.13 -q up seyon1 tack:/tmp$ grep /Seyon.c/ seyon1/CVS/Entries /Seyon.c/1.37/Result of merge+Wed Jun 7 23:50:00 2006// -- Steve McIntyre, Cambridge, UK. [EMAIL PROTECTED] Armed with "Valor": "Centurion" represents quality of Discipline, Honor, Integrity and Loyalty. Now you don't have to be a Caesar to concord the digital world while feeling safe and proud. _______________________________________________ Bug-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/bug-cvs
