edit: $/Dev10/feature/vsl_dynamic/Merlin/Main/Languages/Ruby/context.rb;C576154
File: context.rb
===================================================================
--- $/Dev10/feature/vsl_dynamic/Merlin/Main/Languages/Ruby/context.rb;C576154  (server)    10/3/2008 2:37 PM
+++ Shelved Change: $/Dev10/feature/vsl_dynamic/Merlin/Main/Languages/Ruby/context.rb;tracefixes-1
@@ -401,7 +401,7 @@
           source_file = temp_dir + dir + file
           dest_file = dest + dir + file
 
-          if !compare_file(source_file, dest_file)
+          if File.ctime(source_file) > File.ctime(dest_file) and !compare_file(source_file, dest_file)
             checkout dest_file
             copy source_file, dest_file
           end
===================================================================
add: $/Dev10/feature/vsl_dynamic/Merlin/Main/Languages/Ruby/Libs/etc.rb
File: etc.rb
===================================================================
--- [no source file]
+++ Shelved Change: $/Dev10/feature/vsl_dynamic/Merlin/Main/Languages/Ruby/Libs/etc.rb;tracefixes-1
@@ -1,0 +1,1 @@
+# No-op file since we won't support this under Windows
===================================================================
edit: $/Dev10/feature/vsl_dynamic/Merlin/Main/Languages/Ruby/Libs/rbconfig.rb;C585376
File: rbconfig.rb
===================================================================
--- $/Dev10/feature/vsl_dynamic/Merlin/Main/Languages/Ruby/Libs/rbconfig.rb;C585376  (server)    10/3/2008 2:18 PM
+++ Shelved Change: $/Dev10/feature/vsl_dynamic/Merlin/Main/Languages/Ruby/Libs/rbconfig.rb;tracefixes-1
@@ -35,8 +35,10 @@
   CONFIG["PATCHLEVEL"] = "0"
   CONFIG["prefix"] = (TOPDIR || DESTDIR + "")
   CONFIG["EXEEXT"] = ".exe"
-  CONFIG["ruby_install_name"] = "ironruby"
-  CONFIG["RUBY_INSTALL_NAME"] = "ironruby"
+  # TODO: change back to ironruby
+  CONFIG["ruby_install_name"] = "ruby"
+  CONFIG["RUBY_INSTALL_NAME"] = "ruby"
+  # END TODO:
   CONFIG["RUBY_SO_NAME"] = "msvcrt-ruby18"
   CONFIG["SHELL"] = "$(COMSPEC)"
   CONFIG["BUILD_FILE_SEPARATOR"] = "\\"
===================================================================
edit: $/Dev10/feature/vsl_dynamic/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/BlockDefinition.cs;C585376
File: BlockDefinition.cs
===================================================================
--- $/Dev10/feature/vsl_dynamic/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/BlockDefinition.cs;C585376  (server)    10/3/2008 2:18 PM
+++ Shelved Change: $/Dev10/feature/vsl_dynamic/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/BlockDefinition.cs;tracefixes-1
@@ -101,7 +101,7 @@
             MSA.Expression blockParameter, selfParameter;
             MSA.ParameterExpression[] parameters = DefineParameters(out selfParameter, out blockParameter);
 
-            MSA.Expression scopeVariable = scope.DefineHiddenVariable("#scope", typeof(RubyScope));
+            MSA.Expression scopeVariable = scope.DefineHiddenVariable("#scope", typeof(RubyBlockScope));
             MSA.LabelTarget loopLabel = Ast.Label();
 
             gen.EnterBlockDefinition(
@@ -126,7 +126,7 @@
                     AstFactory.OpCall("CreateBlockScope", scope.VisibleVariables(), parentScope, blockParameter, selfParameter)
                 ),
 
-                gen.TraceEnabled ? AstFactory.OpCall("TraceBlockCall", scopeVariable, blockParameter, Ast.Constant(gen.SourceUnit.Path), Ast.Constant(firstStatementLine)) : Ast.Empty(),
+                gen.TraceEnabled ? AstFactory.OpCall("TraceBlockCall", scopeVariable, blockParameter, Ast.Convert(Ast.Constant(gen.SourceUnit.Path), typeof(string)), Ast.Constant(firstStatementLine)) : Ast.Empty(),
 
                 paramInit,
 
===================================================================
edit: $/Dev10/feature/vsl_dynamic/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/Declarations/MethodDeclaration.cs;C576154
File: MethodDeclaration.cs
===================================================================
--- $/Dev10/feature/vsl_dynamic/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/Declarations/MethodDeclaration.cs;C576154  (server)    10/3/2008 2:18 PM
+++ Shelved Change: $/Dev10/feature/vsl_dynamic/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/Declarations/MethodDeclaration.cs;tracefixes-1
@@ -115,7 +115,7 @@
                     ),
                 
                     _parameters.TransformOptionalsInitialization(gen),
-                    gen.TraceEnabled ? AstFactory.OpCall("TraceMethodCall", scopeVariable, Ast.Constant(gen.SourceUnit.Path), Ast.Constant(Location.Start.Line)) : Ast.Empty(),
+                    gen.TraceEnabled ? AstFactory.OpCall("TraceMethodCall", scopeVariable, Ast.Convert(Ast.Constant(gen.SourceUnit.Path), typeof(string)), Ast.Constant(Location.Start.Line)) : Ast.Empty(),
                     Body.TransformToStatement(gen, ResultOperation.Return)
                 ),
                 ResultOperation.Return
===================================================================