I'd still suggest git. It's really not that strange unless you want it to be.<div><br></div><div>The best reason I can give is the ease of branching and merging. Even if you're one developer, it's a great thing to have. You can easily manage parallel streams, such as adding a new feature, stopping, and making a change in your production version, then going back to your feature branch (and pulling in your production changes)</div>
<div><br></div><div>When I started building <a href="http://smallpayroll.ca">smallpayroll.ca</a> I used SVN. As I started adding bigger and bigger features I needed to branch. <a href="http://ertw.com/blog/2009/08/27/svn-merge/">http://ertw.com/blog/2009/08/27/svn-merge/</a> are the instructions I came up with to figure that out. It was evil. Git is just so much easier in that respect.</div>
<div><br></div><div>I eventually migrated to git and love it. It makes sense. The learning curve was not that bad. It's efficient on my time -- I hardly spend any time thinking about version control.</div><div><br></div>
<div>Now that I've got other people working on it it's easy enough to keep on top of their changes and to share stuff. </div><div><br></div><div>Even though git will work between developer workstations without the need of a server, I'd suggest running something like gitolite. It's a breeze to set up and it makes things a bit easier to share because everyone points to one server.</div>
<div><br></div><div>Git will also happily do what you're trying to do in production. You'd just clone a copy and pull changes as needed. Since the cost of branching/merging is near zero, you can choose to deploy from master or another branch, depending on how you want your workflow to be.</div>
<div><br></div><div>Sean</div><div><br><div class="gmail_quote">On Fri, Sep 30, 2011 at 5:51 AM, Trevor Cordes <span dir="ltr"><<a href="mailto:trevor@tecnopolis.ca">trevor@tecnopolis.ca</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
Following up to last month's meeting topic, I'm wondering if anyone can<br>
help me choose a revision control system for my purposes.<br>
<br>
It'll be 2 developers (possibly more later, but always a small number).<br>
<br>
We'll share access into 1 box, but I'm thinking we'd prefer a system<br>
that lets us check out the complete source tree to our own dev boxes<br>
where we can code, and then merge back up changes.<br>
<br>
Also, it would be great if we could have a way to check out the current<br>
project into a dir that would then serve directly to the web (it's a<br>
php project). For example, I'd want a copy to dev on, the other guy<br>
would have a copy, and a 3rd copy (possibly older) would be the live<br>
web site. When commits are shown to be good, we'd check out into the<br>
live site. Hope that makes sense.<br>
<br>
I'm thinking CVS or subversion. I'm not sure this small project (maybe<br>
30k lines of code) warrants the strangeness of git. Anything else I'm<br>
missing? I'd love to hear the pros/cons.<br>
_______________________________________________<br>
Roundtable mailing list<br>
<a href="mailto:Roundtable@muug.mb.ca">Roundtable@muug.mb.ca</a><br>
<a href="http://www.muug.mb.ca/mailman/listinfo/roundtable" target="_blank">http://www.muug.mb.ca/mailman/listinfo/roundtable</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br>Sean Walberg <<a href="mailto:sean@ertw.com" target="_blank">sean@ertw.com</a>> <a href="http://ertw.com/" target="_blank">http://ertw.com/</a><br>
</div>