GreenBox Posted September 27, 2012 Posted September 27, 2012 bump on this? github now has a "svn emulator" that can be used to checkout/commit and track revisions as numbers so it will not be a problem for the users/developers that don't know how to use Git. 2
Brian Posted September 27, 2012 Posted September 27, 2012 Github is a way better than any other git hosting ._. I think SubGit is a server-side tool you install. It's not Git hosting.
saithis Posted September 27, 2012 Posted September 27, 2012 (edited) Github is a way better than any other git hosting ._. I think SubGit is a server-side tool you install. It's not Git hosting. yes, i tought of using it as a "bridge" between the current svn and github. and i agree, github is the best The things that we would benefit the most of git are in my opinion: 1. You can commit your custom changes to your local copy without making them public (for server own custom stuff - doesn't work with svn) 2. Pull requests! No need for diff files anymore and the user gets always his credits, as he is the commit autor. Also you can discuss it (on a line inside the diff or global for this diff) before merging it. So instead of taking a diff with ugly code and clean it up before commiting, you could tell the pull request autor what is ugly and how to change it and when everything is ok, you merge it. That way he gets better at coding and maybe makes it right the next time. 3. devs can code big stuff in a separate branch without fear of breacking anything and merge it afterwards. That way we have many little commits (if he/she commited often) instead of a huge wall of code in one commit. But if you want to see the "wall of code", you can do that by looking at the diff of the merge. Edited September 27, 2012 by saithis
Brian Posted September 29, 2012 Posted September 29, 2012 I registered as an Open Source project and it was approved, so we have a license in case we decide to use this.
saithis Posted September 29, 2012 Posted September 29, 2012 Just curious, how will it be decided if rA uses it or git generally?
Brian Posted September 29, 2012 Posted September 29, 2012 The way I understood, I thought developers can commit to SVN or Git and SubGit will synchronize the commits between both repositories?
saithis Posted September 29, 2012 Posted September 29, 2012 Yes, thats how I unterstood it too. My question was because of your last post: I registered as an Open Source project and it was approved, so we have a license in case we decide to use this. I interpreted this as "in case we install subgit", so I wanted to know who decides if it will be installed. Or did you mean "it will be installed and lets see if anyone uses it"?
Brian Posted September 29, 2012 Posted September 29, 2012 I think if the majority of the developers agree, then we should install it!
Brian Posted September 30, 2012 Posted September 30, 2012 Can SubGit be used with GitHub (can it push to remote repositories) ?
saithis Posted September 30, 2012 Posted September 30, 2012 (edited) Without GitHub isn't the same thing ;( I agree with that Can SubGit be used with GitHub (can it push to remote repositories) ? http://subgit.com/bo...ml#installation Seems like both (git repo and svn repo) have to be on the same server. So it can't be used directly with GitHub. I googled a bit and it seems like it could be done with post-receive hooks on both ends and maybe a mirror in the middle. But I'm not sure, if the mirror is needed or not. Edited September 30, 2012 by saithis
GreenBox Posted September 30, 2012 Posted September 30, 2012 GitHub support SVN commit/checkout: https://github.com/blog/1178-collaborating-on-github-with-subversion
saithis Posted September 30, 2012 Posted September 30, 2012 Wow, I didn't know that GitHub supports svn That would be even better in my opinion.
nevelis Posted October 28, 2012 Posted October 28, 2012 I sure do prefer git to SVN, it makes merging changes from rAthena & branching really bloody easy. I set up a git mirror of official rAthena here: https://github.com/nevelis/rAthena It's updated every few minutes so it's recent. I would strongly encourage the core dev team move to git too - this will allow people to send in pull requests for features & bug fixes. 1
Cookie Posted November 24, 2012 Posted November 24, 2012 This is already in the process of being worked out. We will still provide support to SVN, as well. Give us some time to transition as we're restructuring the development teams, and its entities. Thanks, -Cookie
Kisuka Posted January 9, 2013 Posted January 9, 2013 Any movement on this? I think moving rAthena onto github would greatly benefit the project. In my opinion, github is the true spirit of open source. People don't have to be in the main dev team to contribute to the project. They can do a fork of the project, add some cool changes, and then others can vote on if it's good enough to be pulled into the main repo. Having it hosted on github will defiantly improve the community aspect of everyone helping contribute. Yes, git is a bit of a learning curve. But once you understand it, you never go back to SVN. Git just works so much better in my opinion... For those interested in reading up on git, I highly suggestion checking out Pro Git : http://git-scm.com/book
Relzz Posted January 13, 2013 Posted January 13, 2013 I really love GIT, is a whole more easyer than SVN ... +1 for this! .. how is this going? ..any news?
Recommended Posts