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

[Steve McIntyre]

On Fri, Jun 02, 2006 at 02:20:33AM -0700, Mark D. Baushke wrote:
>Hi Stephanie,
>
>The information you are producing for me is not very helpful. :-(
>
>I have moved this discussion to the bug-cvs mailing list. For folks just
>joining this problem, look on the info-cvs@gnu.org list archives.
>
>Grasping at straws, the only change I see that might remotely have
>caused a change in behavior between cvs 1.12.9 and 1.12.13 is this one:
>
>2005-09-22  Derek Price  <derek@ximbiot.com>
>
>       * classify.c (Classify_File): Consolidate redundant conditionals.
>
>Does the patch below fix your problem? (Sadly, this means you will need
>to (re)build CVS. If you are not able to build from the cvs 1.12.13a
>sources, this puts us in a bit of an impass as I have no windows boxes
>of any kind in my world...) If you are able to reproduce the problem on
>a Debian system, then things might be easier for you to track down.

I've tried the patch, but still no joy:

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

-- 
Steve McIntyre, Cambridge, UK.                                steve@einval.com
"Because heaters aren't purple!" -- Catherine Pitt