[Omake] SVN Commit: OMake Build System (Rev. 10374)

Jason Hickey jyh at cs.caltech.edu
Sun Apr 8 10:04:33 PDT 2007


Better checking of name definitions.

Darcs is an unmitigated disaster.  Two problems:
   1. Frequent database corruption on MacOSX.  Corruption
      is unrecoverable.
   2. "darcs pull" doesn't terminate.  This means that
      it is impossible to perform a merge.  I only
      changed 15 lines of code!

To get around problem #1, I have to work on Linux.

For #2, I take a very explicit approach.
   - Place markers around code to be modified (*YYY*)...(*/YYY*)
   - Add new code with explicit markers (*XXX*)...(*/XXX*)
   - Delete old code and all markers.
This seems to help darcs figure out where the changes
are.  And it is pretty painful too.

----
Changes:
    +127 -0	omake-jumbo-branches/all-features/0.9.8.x/src/env/omake_ir_ast.ml
    +110 -0	omake-jumbo-branches/auto/0.9.8.x/src/env/omake_ir_ast.ml
    +1 -1	omake-jumbo-branches/const/0.9.8.x/src/Makefile
    +1 -1	omake-jumbo-branches/const/0.9.8.x/src/Makefile.nt
    +121 -0	omake-jumbo-branches/const/0.9.8.x/src/env/omake_ir_ast.ml
    +19 -0	omake-jumbo-branches/dll/0.9.8.x/src/builtin/omake_builtin_object.ml
    +105 -0	omake-jumbo-branches/dll/0.9.8.x/src/env/omake_ir_ast.ml
    +4 -0	omake-jumbo-branches/dll/boring
    +2 -2	omake-jumbo-branches/dll2/0.9.8.x/lib/parse/C/Parse.om
    +127 -0	omake-jumbo-branches/dll2/0.9.8.x/src/env/omake_ir_ast.ml
    +1 -1	omake-jumbo-branches/export/0.9.8.x/src/Makefile
    +1 -1	omake-jumbo-branches/export/0.9.8.x/src/Makefile.nt
    +105 -0	omake-jumbo-branches/export/0.9.8.x/src/env/omake_ir_ast.ml
    +1 -1	omake-jumbo-branches/file/0.9.8.x/src/Makefile
    +1 -1	omake-jumbo-branches/file/0.9.8.x/src/Makefile.nt
    +105 -0	omake-jumbo-branches/file/0.9.8.x/src/env/omake_ir_ast.ml
    +1 -1	omake-jumbo-branches/open/0.9.8.x/src/Makefile
    +1 -1	omake-jumbo-branches/open/0.9.8.x/src/Makefile.nt
    +105 -0	omake-jumbo-branches/open/0.9.8.x/src/env/omake_ir_ast.ml
    +127 -0	omake-jumbo-branches/parse/0.9.8.x/src/env/omake_ir_ast.ml
    +1 -1	omake-jumbo-branches/var3/0.9.8.x/src/Makefile
    +1 -1	omake-jumbo-branches/var3/0.9.8.x/src/Makefile.nt
    +105 -0	omake-jumbo-branches/var3/0.9.8.x/src/env/omake_ir_ast.ml
    +1 -1	omake-jumbo-branches/var4/0.9.8.x/src/Makefile
    +1 -1	omake-jumbo-branches/var4/0.9.8.x/src/Makefile.nt
    +105 -0	omake-jumbo-branches/var4/0.9.8.x/src/env/omake_ir_ast.ml
 
A hyperlinked version of this commit is available at
http://svn.metaprl.org/commitlogs/omake/2007-04.html#07/04/08.10:04:33



More information about the OMake-CVS mailing list