[Cruisecontrolrb-users] Conflicts with schema.rb?

Billy Kimble bkimble at inc21.com
Wed Apr 30 13:39:32 EDT 2008


Your best bet is to SVN ignore schema.rb.  Rails generates it any  
time you do db:migrate so that when you do db:test:prepare, it will  
know what schema to make your test environment equal to.

If you add a migration and migrate up to that point and commit your  
schema.rb file, and someone does SVN up but choses not to migrate  
yet, they are pretty much guaranteed to get conflicts.

Billy

On Apr 30, 2008, at 10:16 AM, Will Sargent wrote:

> This is interesting, and I'm still not exactly sure what's causing it.
>
> When people check in files, occasionally CruiseControl will error out
> saying that there's a conflict in schema.rb.  I can go into
> cruisecontrol and svn revert the file, but it's cropped up several
> times, and I'm getting a little tired of it.
>
> How does schema.rb work?  I've read through The Rails Way and some
> online references, but I still don't really think I understand how
> Rails, integration testing and database migration all interact.
> What's the usual cause of this, and is there some series of steps in
> CruiseControl or rake that prevents this happening?
>
> Will.
> _______________________________________________
> Cruisecontrolrb-users mailing list
> Cruisecontrolrb-users at rubyforge.org
> http://rubyforge.org/mailman/listinfo/cruisecontrolrb-users
>
> -- 
> This message has been scanned for viruses and
> dangerous content by MailScanner, and is
> believed to be clean.


-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.



More information about the Cruisecontrolrb-users mailing list