cvs problems ...

[Andrew Haley]

Diego Novillo writes:
 > On Fri, 2004-10-08 at 09:14, Dave Korn wrote:
 > 
 > > I don't currently have an up-to-date tree checked out, but you guys might
 > > like to give it another go.
 > > 
 > [ Adding overseers@ ]
 > 
 > Nope.  It's still hosed:
 > 
 > cvs checkout: Updating gcc/boehm-gc/doc
 > cvs [checkout aborted]: branch attribute does not match file for `/cvs/gcc/gcc/boehm-gc/doc/simple_example.html,v'

That is at least a different file, so whatever worked for
NT_STATIC_THREADS_MAKEFILE will presumably work again.

However did you manage to do merges from mainline to the SSA branch?

Andrew.