Bump migration to avoid conflict when merging to trunk

db/migrate/042_change_dates_to_datetimes.rb

@@ -0,0 +1,27 @@
+class ChangeDatesToDatetimes < ActiveRecord::Migration
+  def self.up
+    change_column :todos, :show_from, :datetime
+    change_column :todos, :due, :datetime
+    change_column :recurring_todos, :start_from, :datetime
+    change_column :recurring_todos, :end_date, :datetime
+
+    User.all(:include => [:todos, :recurring_todos]).each do |user|
+      user.todos.each do |todo|
+        todo.update_attribute(:show_from, user.at_midnight(todo.show_from)) unless todo.show_from.nil?
+        todo.update_attribute(:due, user.at_midnight(todo.due)) unless todo.due.nil?
+      end
+
+      user.recurring_todos.each do |todo|
+        todo.update_attribute(:start_from, user.at_midnight(todo.start_from)) unless todo.start_from.nil?
+        todo.update_attribute(:end_date, user.at_midnight(todo.end_date)) unless todo.end_date.nil?
+      end
+    end
+  end
+
+  def self.down
+    change_column :todos, :show_from, :date
+    change_column :todos, :due, :date
+    change_column :recurring_todos, :start_from, :date
+    change_column :recurring_todos, :end_date, :date
+  end
+end