Comments on: Source Control Paradigms and Continuous Integration http://thepursuitofalife.com/source-control-paradigms-and-continuous-integration/ Wouldn't you rather be writing code? Thu, 11 Mar 2010 14:41:58 -0800 http://wordpress.org/?v=2.8.3 hourly 1 By: Anthony Stevens http://thepursuitofalife.com/source-control-paradigms-and-continuous-integration/comment-page-1/#comment-496 Anthony Stevens Thu, 31 Jan 2008 06:20:13 +0000 http://xidey.wordpress.com/?p=454#comment-496 Awesome. That makes sense. The CI product I use (Draco.NET) runs on what's called a "check-in", which I believe is equivalent to a SVN commit. So the CI build wouldn't run until the merge problem was resolved. Question: will the SVN update command fail if there are merge problems? Or only the commit portion? Seems like it would be consistent with what you wrote if the update would fail as well. Thanks Craig! Awesome. That makes sense. The CI product I use (Draco.NET) runs on what’s called a “check-in”, which I believe is equivalent to a SVN commit. So the CI build wouldn’t run until the merge problem was resolved.

Question: will the SVN update command fail if there are merge problems? Or only the commit portion? Seems like it would be consistent with what you wrote if the update would fail as well.

Thanks Craig!

]]> By: Craig Huizenga http://thepursuitofalife.com/source-control-paradigms-and-continuous-integration/comment-page-1/#comment-495 Craig Huizenga Thu, 31 Jan 2008 05:15:48 +0000 http://xidey.wordpress.com/?p=454#comment-495 Subversions commits are atomic, so if there is a problem with one of the files in the commit, none will be commited. Also, any merge issues would be taken care of before the commit, since if you try to commit when a file is out of state, it will cause the whole commit to fail, and tell you to update and merge your files first. Of course, if you don't run you tests after you update and before you commit, you could very well find that the merge didn't work very well, and break your code - but that's your fault for being a dumb-ass (yes, said by someone that has done it several times...), not SVN's. Subversions commits are atomic, so if there is a problem with one of the files in the commit, none will be commited. Also, any merge issues would be taken care of before the commit, since if you try to commit when a file is out of state, it will cause the whole commit to fail, and tell you to update and merge your files first. Of course, if you don’t run you tests after you update and before you commit, you could very well find that the merge didn’t work very well, and break your code – but that’s your fault for being a dumb-ass (yes, said by someone that has done it several times…), not SVN’s.

]]>