On Thu, 26 Apr 2007 07:16:31 -0700 Jeff Cohen <[EMAIL PROTECTED]> wrote: > My nightly tester failed last night for the following >reason: > > cvs update: conflicts found in >lib/AsmParser/llvmAsmParser.cpp.cvs > C lib/AsmParser/llvmAsmParser.cpp.cvs > > > Needless to say, the tester is not in the business of >modifying source code, but it manages to modify a file >under cvs control anyway and do so in a way that >conflicts with subsequent changes.
The nightly tester doesn't do "update", only "checkout", so I'm not sure how you got this last night. Sure this didn't come from your wrapper script? > > The way bison files are managed needs to be fixed so >that files under cvs control do not change unless a human >wants them to change. That is exactly the current situation. The problem is that someone checked in a new version of the .cvs file while you also had uncommitted changes (from running bison locally). However, I agree in general that these files are awkward to deal with. There's only two solutions I can think of: (a) rewrite the parser to be recursive descent and avoid use of bison, or (b) require all platforms to have bison. Neither are attractive. I'm interested because I'd like to fix this as part of the scons work. Reid. _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
