aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2013-02-15 07:45:45 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2013-02-15 07:45:45 -0800
commita159f471e4876eab6e34214e11ee006d714ebf8a (patch)
treee497d908022c734af8c6bbdec63815f38df64eb5
parent9d023c87de98f8c85574ecec019dd30a3dfc6f03 (diff)
parentb4c99ea0a4d7e5223fa1b21cdb9301f9d090dbfe (diff)
downloadrails-a159f471e4876eab6e34214e11ee006d714ebf8a.tar.gz
rails-a159f471e4876eab6e34214e11ee006d714ebf8a.tar.bz2
rails-a159f471e4876eab6e34214e11ee006d714ebf8a.zip
Merge pull request #9298 from wangjohn/add_documentation_to_migration_collision
Added extra comment when a migration already exists of the same name
-rw-r--r--railties/lib/rails/generators/migration.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/migration.rb b/railties/lib/rails/generators/migration.rb
index 5bf98bb6e0..cd69a017dd 100644
--- a/railties/lib/rails/generators/migration.rb
+++ b/railties/lib/rails/generators/migration.rb
@@ -52,7 +52,7 @@ module Rails
if destination && options.force?
remove_file(destination)
elsif destination
- raise Error, "Another migration is already named #{@migration_file_name}: #{destination}"
+ raise Error, "Another migration is already named #{@migration_file_name}: #{destination}. Use --force to remove the old migration file and replace it."
end
destination = File.join(migration_dir, "#{@migration_number}_#{@migration_file_name}.rb")
end