<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -19,6 +19,17 @@ tasks_path = File.join(File.dirname(__FILE__), &quot;lib&quot;, &quot;tasks&quot;)
 rake_files = Dir[&quot;#{tasks_path}/*.rake&quot;]
 rake_files.each{|rake_file| load rake_file }
 
+# Hack for top-level name clash between vlad and datamapper.
+if Rake.application.top_level_tasks.any? {|t| t == 'deploy' or t =~ /^vlad:/}
+  begin
+    $TESTING = true # Required to bypass check for reserved_name? in vlad. DataMapper 0.9.x defines Kernel#repository...
+    require 'vlad'
+    Vlad.load :scm =&gt; &quot;git&quot;, :app =&gt; nil, :web =&gt; nil
+  rescue LoadError
+    # do nothing
+  end
+end
+
 desc &quot;Start runner environment&quot;
 task :merb_env do
   Merb.start_environment(:environment =&gt; init_env, :adapter =&gt; 'runner')</diff>
      <filename>Rakefile</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>4693945cf735b6b1211180cbe58fceca0ed4161e</id>
    </parent>
  </parents>
  <author>
    <name>Piotr Solnica</name>
    <email>piotr@zenbe.com</email>
  </author>
  <url>http://github.com/LunarLogicPolska/utype/commit/b7a43de9a6fb3d3f96932e91c259eeff2162777f</url>
  <id>b7a43de9a6fb3d3f96932e91c259eeff2162777f</id>
  <committed-date>2009-02-23T05:20:17-08:00</committed-date>
  <authored-date>2009-02-23T05:20:17-08:00</authored-date>
  <message>added vlad stuff to the rakefile</message>
  <tree>35c00abd13b50fdf86caf9f248ccc002a8b42cea</tree>
  <committer>
    <name>Piotr Solnica</name>
    <email>piotr@zenbe.com</email>
  </committer>
</commit>
