Changes by: Jason Hickey (jyh at cs.caltech.edu)
Date: 2007-03-30 21:25:39 -0700 (Fri, 30 Mar 2007)
Revision: 10308
Log message:

      The merge "all-features" does not work as well as I expected.
     Here are the stages.  The middle column branches from var4,
     and merges to all-features.
     
         var4      open      all-features
                   const
                   export
                   auto
     
     git is not doing a good job.  Whenever I change var4, the updates
     to the middle column are easy.  The merge to all-features tries
     to replay the entire branch, generating massive useless conflicts.
     
     I'm going to try squashing the commits to a single large patch,
     and see if this does better.

Changes  Path
+1 -1 omake-jumbo-branches/DEPENDENCIES
+1 -1 omake-jumbo-branches/all-features/0.9.8.x/lib/parse/C/Parse.om
+2 -2 omake-jumbo-branches/all-features/0.9.8.x/src/build/omake_builtin_util.ml
+31 -1 omake-jumbo-branches/all-features/0.9.8.x/src/builtin/omake_builtin_io.ml
+4 -4 omake-jumbo-branches/all-features/0.9.8.x/src/env/omake_command_digest.ml
+132 -134 omake-jumbo-branches/all-features/0.9.8.x/src/env/omake_ir_ast.ml
+1 -1 omake-jumbo-branches/all-features/0.9.8.x/src/eval/omake_value.ml
+30 -32 omake-jumbo-branches/all-features/0.9.8.x/src/ir/omake_ir.ml
+40 -13 omake-jumbo-branches/all-features/0.9.8.x/src/ir/omake_ir_print.ml
+1 -1 omake-jumbo-branches/auto/0.9.8.x/src/Makefile
+1 -1 omake-jumbo-branches/auto/0.9.8.x/src/Makefile.nt
+2 -2 omake-jumbo-branches/auto/0.9.8.x/src/build/omake_builtin_util.ml
+31 -1 omake-jumbo-branches/auto/0.9.8.x/src/builtin/omake_builtin_io.ml
+4 -4 omake-jumbo-branches/auto/0.9.8.x/src/env/omake_command_digest.ml
+138 -140 omake-jumbo-branches/auto/0.9.8.x/src/env/omake_ir_ast.ml
+1 -1 omake-jumbo-branches/auto/0.9.8.x/src/eval/omake_value.ml
+30 -32 omake-jumbo-branches/auto/0.9.8.x/src/ir/omake_ir.ml
+7 -14 omake-jumbo-branches/auto/0.9.8.x/src/ir/omake_ir_print.ml
+1 -0 omake-jumbo-branches/auto/0.9.8.x/src/ir/omake_ir_print.mli
+1 -0 omake-jumbo-branches/auto/0.9.8.x/src/ir/omake_symbol.ml
+2 -2 omake-jumbo-branches/const/0.9.8.x/src/build/omake_builtin_util.ml
+31 -1 omake-jumbo-branches/const/0.9.8.x/src/builtin/omake_builtin_io.ml
+4 -4 omake-jumbo-branches/const/0.9.8.x/src/env/omake_command_digest.ml
+130 -122 omake-jumbo-branches/const/0.9.8.x/src/env/omake_ir_ast.ml
+1 -1 omake-jumbo-branches/const/0.9.8.x/src/eval/omake_value.ml
+24 -27 omake-jumbo-branches/const/0.9.8.x/src/ir/omake_ir.ml
+7 -14 omake-jumbo-branches/const/0.9.8.x/src/ir/omake_ir_print.ml
+1 -0 omake-jumbo-branches/const/0.9.8.x/src/ir/omake_ir_print.mli
+1 -0 omake-jumbo-branches/const/0.9.8.x/src/ir/omake_symbol.ml
+2 -2 omake-jumbo-branches/export/0.9.8.x/src/build/omake_builtin_util.ml
+31 -1 omake-jumbo-branches/export/0.9.8.x/src/builtin/omake_builtin_io.ml
+4 -4 omake-jumbo-branches/export/0.9.8.x/src/env/omake_command_digest.ml
+131 -123 omake-jumbo-branches/export/0.9.8.x/src/env/omake_ir_ast.ml
+1 -1 omake-jumbo-branches/export/0.9.8.x/src/eval/omake_value.ml
+24 -27 omake-jumbo-branches/export/0.9.8.x/src/ir/omake_ir.ml
+6 -13 omake-jumbo-branches/export/0.9.8.x/src/ir/omake_ir_print.ml
+1 -0 omake-jumbo-branches/export/0.9.8.x/src/ir/omake_ir_print.mli
+1 -0 omake-jumbo-branches/export/0.9.8.x/src/ir/omake_symbol.ml
+2 -2 omake-jumbo-branches/file/0.9.8.x/src/build/omake_builtin_util.ml
+31 -1 omake-jumbo-branches/file/0.9.8.x/src/builtin/omake_builtin_io.ml
+4 -4 omake-jumbo-branches/file/0.9.8.x/src/env/omake_command_digest.ml
+133 -125 omake-jumbo-branches/file/0.9.8.x/src/env/omake_ir_ast.ml
+1 -1 omake-jumbo-branches/file/0.9.8.x/src/eval/omake_value.ml
+24 -27 omake-jumbo-branches/file/0.9.8.x/src/ir/omake_ir.ml
+7 -14 omake-jumbo-branches/file/0.9.8.x/src/ir/omake_ir_print.ml
+1 -0 omake-jumbo-branches/file/0.9.8.x/src/ir/omake_ir_print.mli
+1 -0 omake-jumbo-branches/file/0.9.8.x/src/ir/omake_symbol.ml
+31 -1 omake-jumbo-branches/keyword/0.9.8.x/src/builtin/omake_builtin_io.ml
+2 -2 omake-jumbo-branches/open/0.9.8.x/src/build/omake_builtin_util.ml
+31 -1 omake-jumbo-branches/open/0.9.8.x/src/builtin/omake_builtin_io.ml
+4 -4 omake-jumbo-branches/open/0.9.8.x/src/env/omake_command_digest.ml
+130 -122 omake-jumbo-branches/open/0.9.8.x/src/env/omake_ir_ast.ml
+1 -1 omake-jumbo-branches/open/0.9.8.x/src/eval/omake_value.ml
+24 -27 omake-jumbo-branches/open/0.9.8.x/src/ir/omake_ir.ml
+7 -14 omake-jumbo-branches/open/0.9.8.x/src/ir/omake_ir_print.ml
+1 -0 omake-jumbo-branches/open/0.9.8.x/src/ir/omake_ir_print.mli
+1 -0 omake-jumbo-branches/open/0.9.8.x/src/ir/omake_symbol.ml
Copied omake-jumbo-branches/parse/ (from rev 10276, omake-jumbo-branches/all-features)
+3 -1 omake-jumbo-branches/parse/0.9.8.x/lib/Pervasives.om
+12 -12 omake-jumbo-branches/parse/0.9.8.x/lib/parse/C/Lex.om
+1 -1 omake-jumbo-branches/parse/0.9.8.x/lib/parse/C/Parse.om
Replaced omake-jumbo-branches/parse/0.9.8.x/src/build/omake_builtin.ml
Copied omake-jumbo-branches/parse/0.9.8.x/src/build/omake_builtin.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/build/omake_builtin.ml)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/build/omake_builtin_type.ml
Copied omake-jumbo-branches/parse/0.9.8.x/src/build/omake_builtin_type.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/build/omake_builtin_type.ml)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/build/omake_builtin_util.ml
Copied omake-jumbo-branches/parse/0.9.8.x/src/build/omake_builtin_util.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/build/omake_builtin_util.ml)
+2 -2 omake-jumbo-branches/parse/0.9.8.x/src/build/omake_builtin_util.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/build/omake_builtin_util.ml)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/build/omake_rule.ml
Copied omake-jumbo-branches/parse/0.9.8.x/src/build/omake_rule.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/build/omake_rule.ml)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/builtin/omake_builtin_base.ml
Copied omake-jumbo-branches/parse/0.9.8.x/src/builtin/omake_builtin_base.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/builtin/omake_builtin_base.ml)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/builtin/omake_builtin_file.ml
Copied omake-jumbo-branches/parse/0.9.8.x/src/builtin/omake_builtin_file.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/builtin/omake_builtin_file.ml)
+31 -1 omake-jumbo-branches/parse/0.9.8.x/src/builtin/omake_builtin_io.ml
Replaced omake-jumbo-branches/parse/0.9.8.x/src/builtin/omake_builtin_io_fun.ml
Copied omake-jumbo-branches/parse/0.9.8.x/src/builtin/omake_builtin_io_fun.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/builtin/omake_builtin_io_fun.ml)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/builtin/omake_builtin_object.ml
Copied omake-jumbo-branches/parse/0.9.8.x/src/builtin/omake_builtin_object.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/builtin/omake_builtin_object.ml)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/builtin/omake_builtin_rule.ml
Copied omake-jumbo-branches/parse/0.9.8.x/src/builtin/omake_builtin_rule.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/builtin/omake_builtin_rule.ml)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/builtin/omake_builtin_shell.ml
Copied omake-jumbo-branches/parse/0.9.8.x/src/builtin/omake_builtin_shell.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/builtin/omake_builtin_shell.ml)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/builtin/omake_builtin_target.ml
Copied omake-jumbo-branches/parse/0.9.8.x/src/builtin/omake_builtin_target.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/builtin/omake_builtin_target.ml)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/builtin/omake_builtin_test.ml
Copied omake-jumbo-branches/parse/0.9.8.x/src/builtin/omake_builtin_test.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/builtin/omake_builtin_test.ml)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/env/omake_command_digest.ml
Copied omake-jumbo-branches/parse/0.9.8.x/src/env/omake_command_digest.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/env/omake_command_digest.ml)
+4 -4 omake-jumbo-branches/parse/0.9.8.x/src/env/omake_command_digest.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/env/omake_command_digest.ml)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/env/omake_env.ml
Copied omake-jumbo-branches/parse/0.9.8.x/src/env/omake_env.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/env/omake_env.ml)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/env/omake_env.mli
Copied omake-jumbo-branches/parse/0.9.8.x/src/env/omake_env.mli (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/env/omake_env.mli)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/env/omake_ir_ast.ml
Copied omake-jumbo-branches/parse/0.9.8.x/src/env/omake_ir_ast.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/env/omake_ir_ast.ml)
+132 -134 omake-jumbo-branches/parse/0.9.8.x/src/env/omake_ir_ast.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/env/omake_ir_ast.ml)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/env/omake_ir_free_vars.ml
Copied omake-jumbo-branches/parse/0.9.8.x/src/env/omake_ir_free_vars.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/env/omake_ir_free_vars.ml)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/env/omake_ir_semant.ml
Copied omake-jumbo-branches/parse/0.9.8.x/src/env/omake_ir_semant.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/env/omake_ir_semant.ml)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/eval/omake_eval.ml
Copied omake-jumbo-branches/parse/0.9.8.x/src/eval/omake_eval.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/eval/omake_eval.ml)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/eval/omake_eval.mli
Copied omake-jumbo-branches/parse/0.9.8.x/src/eval/omake_eval.mli (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/eval/omake_eval.mli)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/eval/omake_value.ml
Copied omake-jumbo-branches/parse/0.9.8.x/src/eval/omake_value.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/eval/omake_value.ml)
+1 -1 omake-jumbo-branches/parse/0.9.8.x/src/eval/omake_value.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/eval/omake_value.ml)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/ir/omake_ir.ml
Copied omake-jumbo-branches/parse/0.9.8.x/src/ir/omake_ir.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/ir/omake_ir.ml)
+30 -32 omake-jumbo-branches/parse/0.9.8.x/src/ir/omake_ir.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/ir/omake_ir.ml)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/ir/omake_ir_print.ml
Copied omake-jumbo-branches/parse/0.9.8.x/src/ir/omake_ir_print.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/ir/omake_ir_print.ml)
+40 -13 omake-jumbo-branches/parse/0.9.8.x/src/ir/omake_ir_print.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/ir/omake_ir_print.ml)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/ir/omake_ir_print.mli
Copied omake-jumbo-branches/parse/0.9.8.x/src/ir/omake_ir_print.mli (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/ir/omake_ir_print.mli)
+1 -0 omake-jumbo-branches/parse/0.9.8.x/src/ir/omake_ir_print.mli (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/ir/omake_ir_print.mli)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/ir/omake_ir_util.ml
Copied omake-jumbo-branches/parse/0.9.8.x/src/ir/omake_ir_util.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/ir/omake_ir_util.ml)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/ir/omake_symbol.ml
Copied omake-jumbo-branches/parse/0.9.8.x/src/ir/omake_symbol.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/ir/omake_symbol.ml)
+1 -0 omake-jumbo-branches/parse/0.9.8.x/src/ir/omake_symbol.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/ir/omake_symbol.ml)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/main/omake_shell.ml
Copied omake-jumbo-branches/parse/0.9.8.x/src/main/omake_shell.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/main/omake_shell.ml)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/shell/omake_shell_job.ml
Copied omake-jumbo-branches/parse/0.9.8.x/src/shell/omake_shell_job.ml (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/shell/omake_shell_job.ml)
Replaced omake-jumbo-branches/parse/0.9.8.x/src/shell/omake_shell_job.mli
Copied omake-jumbo-branches/parse/0.9.8.x/src/shell/omake_shell_job.mli (from rev 10295, omake-jumbo-branches/all-features/0.9.8.x/src/shell/omake_shell_job.mli)
+3 -0 omake-jumbo-branches/parse/0.9.8.x/tests/parse/C/input.c
+31 -1 omake-jumbo-branches/var1/0.9.8.x/src/builtin/omake_builtin_io.ml
+31 -1 omake-jumbo-branches/var2/0.9.8.x/src/builtin/omake_builtin_io.ml
+2 -2 omake-jumbo-branches/var3/0.9.8.x/src/build/omake_builtin_util.ml
+31 -1 omake-jumbo-branches/var3/0.9.8.x/src/builtin/omake_builtin_io.ml
+4 -4 omake-jumbo-branches/var3/0.9.8.x/src/env/omake_command_digest.ml
+133 -125 omake-jumbo-branches/var3/0.9.8.x/src/env/omake_ir_ast.ml
+1 -1 omake-jumbo-branches/var3/0.9.8.x/src/eval/omake_value.ml
+23 -26 omake-jumbo-branches/var3/0.9.8.x/src/ir/omake_ir.ml
+7 -14 omake-jumbo-branches/var3/0.9.8.x/src/ir/omake_ir_print.ml
+1 -0 omake-jumbo-branches/var3/0.9.8.x/src/ir/omake_ir_print.mli
+1 -0 omake-jumbo-branches/var3/0.9.8.x/src/ir/omake_symbol.ml
+2 -2 omake-jumbo-branches/var4/0.9.8.x/src/build/omake_builtin_util.ml
+31 -1 omake-jumbo-branches/var4/0.9.8.x/src/builtin/omake_builtin_io.ml
+4 -4 omake-jumbo-branches/var4/0.9.8.x/src/env/omake_command_digest.ml
+133 -125 omake-jumbo-branches/var4/0.9.8.x/src/env/omake_ir_ast.ml
+1 -1 omake-jumbo-branches/var4/0.9.8.x/src/eval/omake_value.ml
+24 -27 omake-jumbo-branches/var4/0.9.8.x/src/ir/omake_ir.ml
+7 -14 omake-jumbo-branches/var4/0.9.8.x/src/ir/omake_ir_print.ml
+1 -0 omake-jumbo-branches/var4/0.9.8.x/src/ir/omake_ir_print.mli
+1 -0 omake-jumbo-branches/var4/0.9.8.x/src/ir/omake_symbol.ml