aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides
diff options
context:
space:
mode:
authorJason Noble <perlwizard@gmail.com>2011-12-03 19:10:49 -0700
committerJason Noble <perlwizard@gmail.com>2011-12-03 19:31:43 -0700
commit1f765a2f720c63b8b0e937a100837d27731719aa (patch)
tree9373e8ba8e7271fec096da625dd1b5c1db90e0ea /railties/guides
parentc8f8ecfd38e20ee936ea4ccbb879acf006fe3cb8 (diff)
downloadrails-1f765a2f720c63b8b0e937a100837d27731719aa.tar.gz
rails-1f765a2f720c63b8b0e937a100837d27731719aa.tar.bz2
rails-1f765a2f720c63b8b0e937a100837d27731719aa.zip
Re-word confusing section
Diffstat (limited to 'railties/guides')
-rw-r--r--railties/guides/source/migrations.textile7
1 files changed, 3 insertions, 4 deletions
diff --git a/railties/guides/source/migrations.textile b/railties/guides/source/migrations.textile
index ee0aa1d0f1..2654b43cad 100644
--- a/railties/guides/source/migrations.textile
+++ b/railties/guides/source/migrations.textile
@@ -163,10 +163,9 @@ allows Rails to handle common situations that occur with multiple developers.
For example Alice adds migrations +20080906120000+ and +20080906123000+ and Bob
adds +20080906124500+ and runs it. Alice finishes her changes and checks in her
-migrations and Bob pulls down the latest changes. Rails knows that it has not
-run Alice's two migrations so +rake db:migrate+ would run them (even though
-Bob's migration with a later timestamp has been run), and similarly migrating
-down would not run their +down+ methods.
+migrations and Bob pulls down the latest changes. When Bob runs +rake
+db:migrate+, Rails knows that it has not run Alice's two migrations so it
+executes the +up+ method for each migration.
Of course this is no substitution for communication within the team. For
example, if Alice's migration removed a table that Bob's migration assumed to