Re: [crossfire] Crossfire should use Git

2014-06-16 Thread Otto J. Makela
On 2014-06-14 02:11, Kevin R. Bulgrien wrote: I am not a fan of git. Not all of these are exactly correct, but I think you get the gist: http://steveko.wordpress.com/2012/02/24/10-things-i-hate-about-git/ Then compare with this git is great article:

Re: [crossfire] Crossfire should use Git

2014-06-16 Thread Mark Wedel
On 06/14/14 11:30 AM, Kevin Zheng wrote: snip I believe the most compelling reason to use a DVCS is that it makes contributions easier. About a year ago a common complaint about my patches were that too many changes were lumped together in one patch, making it hard to review. While I could have

Re: [crossfire] Crossfire should use Git

2014-06-14 Thread Kevin Zheng
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi again, First, a few responses: Many of the reasons I mentioned do extend to most DVCSs, and this is the fault of my own (thinking that Git == DVCS). I'll concede that Git has a fairly steep learning curve, although I'll assert that it is harder

Re: [crossfire] Crossfire should use Git

2014-06-14 Thread Nicolas Weeger
/me throws some plain non blessed water to squash the religious war Nicolas Le vendredi 13 juin 2014 15:13:22, Kevin Zheng a écrit : Hi all, Crossfire originally lived in the world of CVS, until a handful of brave knights ventured to move it to SVN. Today I believe it is time to move

Re: [crossfire] Crossfire should use Git

2014-06-13 Thread Steven Johnson
I'm not a regular contributor either but I believe mercurial (hg) is the better choice as well. Plus the site Bloody Shade mentioned http://hginit.com/ easily explains the transition from svn to hg. On Jun 13, 2014 9:29 AM, Bloody Shade bloodysh...@gmail.com wrote: I'm not sure I can agree with

Re: [crossfire] Crossfire should use Git

2014-06-13 Thread Rick Tanner
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 My questions on going with a distributed revision control has to do with how does all these changes in a branch make it back to the main code base? This is not a question in regards to command syntax and code merging practices. It's more on a

Re: [crossfire] Crossfire should use Git

2014-06-13 Thread Kevin Zheng
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 06/13/2014 18:03, Rick Tanner wrote: My questions on going with a distributed revision control has to do with how does all these changes in a branch make it back to the main code base? Perhaps I'm asking who brings in all the changes from the

Re: [crossfire] Crossfire should use Git

2014-06-13 Thread Mark Wedel
Whenever these discussions come up (this is probably the 3rd or 4th iteration), the general response is 'we should use the VCS that I'm most familiar with' So on that basis, I'd vote for mercurial (use it at work) or SVN (crossfire already uses it) All that being said, for the amount